diff options
| author | Rob Johnston <rob.johnston@joyent.com> | 2018-09-12 14:56:30 -0700 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-09-18 12:57:51 -0400 |
| commit | cbb9248e66a77c6382c6f48aebae5fd0ee60fa69 (patch) | |
| tree | 4be74fb0ba67addc82c7e0204b106a6ff564ea7c | |
| parent | 00d7a6fb939233ed021b823016c33fcae1dac964 (diff) | |
| download | illumos-joyent-cbb9248e66a77c6382c6f48aebae5fd0ee60fa69.tar.gz | |
9835 ses topo module should use topo_mod_clean_str()
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/lib/fm/topo/modules/common/ses/ses.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/lib/fm/topo/modules/common/ses/ses.c b/usr/src/lib/fm/topo/modules/common/ses/ses.c index 681c47f005..9a183c9845 100644 --- a/usr/src/lib/fm/topo/modules/common/ses/ses.c +++ b/usr/src/lib/fm/topo/modules/common/ses/ses.c @@ -23,7 +23,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2017, Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ #include <alloca.h> @@ -1452,9 +1452,9 @@ ses_create_generic(ses_enum_data_t *sdp, ses_enum_node_t *snp, tnode_t *pnode, /* * For the node label, we look for the following in order: * - * <ses-description> - * <ses-class-description> <instance> - * <default-type-label> <instance> + * <ses-description> + * <ses-class-description> <instance> + * <default-type-label> <instance> */ if (nvlist_lookup_string(props, SES_PROP_DESCRIPTION, &desc) != 0 || desc[0] == '\0') { @@ -2837,9 +2837,9 @@ ses_create_chassis(ses_enum_data_t *sdp, tnode_t *pnode, ses_enum_chassis_t *cp) /* * We use the following property mappings: * - * manufacturer vendor-id - * model product-id - * serial-number libses-chassis-serial + * manufacturer vendor-id + * model product-id + * serial-number libses-chassis-serial */ verify(nvlist_lookup_string(props, SES_EN_PROP_VID, &raw_manufacturer) == 0); @@ -2854,9 +2854,9 @@ ses_create_chassis(ses_enum_data_t *sdp, tnode_t *pnode, ses_enum_chassis_t *cp) * 'product-id', we use a concatenation of 'manufacturer-model'. We * also take the numerical serial number and convert it to a string. */ - if ((manufacturer = disk_auth_clean(mod, raw_manufacturer)) == NULL || - (model = disk_auth_clean(mod, raw_model)) == NULL || - (revision = disk_auth_clean(mod, raw_revision)) == NULL) { + if ((manufacturer = topo_mod_clean_str(mod, raw_manufacturer)) == + NULL || (model = topo_mod_clean_str(mod, raw_model)) == NULL || + (revision = topo_mod_clean_str(mod, raw_revision)) == NULL) { goto error; } |