diff options
Diffstat (limited to 'usr/src/cmd/fs.d/nfs/lib/smfcfg.c')
| -rw-r--r-- | usr/src/cmd/fs.d/nfs/lib/smfcfg.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/usr/src/cmd/fs.d/nfs/lib/smfcfg.c b/usr/src/cmd/fs.d/nfs/lib/smfcfg.c index 892f0cd052..40922c895b 100644 --- a/usr/src/cmd/fs.d/nfs/lib/smfcfg.c +++ b/usr/src/cmd/fs.d/nfs/lib/smfcfg.c @@ -40,7 +40,7 @@ fs_smf_init(char *fmri, char *instance) * svc name is of the form svc://network/fs/server:instance1 * FMRI portion is /network/fs/server */ - snprintf(srv, MAXPATHLEN, "%s", fmri + strlen("svc:/")); + (void) snprintf(srv, MAXPATHLEN, "%s", fmri + strlen("svc:/")); svcname = strrchr(srv, ':'); if (svcname != NULL) *svcname = '\0'; @@ -96,7 +96,7 @@ fs_smf_fini(fs_smfhandle_t *handle) scf_property_destroy(handle->fs_property); scf_value_destroy(handle->fs_value); if (handle->fs_handle != NULL) { - scf_handle_unbind(handle->fs_handle); + (void) scf_handle_unbind(handle->fs_handle); scf_handle_destroy(handle->fs_handle); } free(handle); @@ -125,15 +125,15 @@ fs_smf_set_prop(smf_fstype_t fstype, char *prop_name, char *valbuf, * The SVC names we are using currently are already * appended by default. Fix this for instances project. */ - snprintf(srv, MAXPATHLEN, "%s", fmri); + (void) snprintf(srv, MAXPATHLEN, "%s", fmri); p = strstr(fmri, ":default"); if (p == NULL) { - strcat(srv, ":"); + (void) strcat(srv, ":"); if (instance == NULL) instance = "default"; if (strlen(srv) + strlen(instance) > MAXPATHLEN) goto out; - strncat(srv, instance, strlen(instance)); + (void) strncat(srv, instance, strlen(instance)); } svcname = srv; phandle = fs_smf_init(fmri, instance); @@ -223,9 +223,11 @@ fs_smf_set_prop(smf_fstype_t fstype, char *prop_name, char *valbuf, ret = SMF_SYSTEM_ERR; } break; + default: + break; } if (ret != SMF_SYSTEM_ERR) - scf_transaction_commit(tran); + (void) scf_transaction_commit(tran); } out: if (tran != NULL) @@ -256,15 +258,15 @@ fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf, * The SVC names we are using currently are already * appended by default. Fix this for instances project. */ - snprintf(srv, MAXPATHLEN, "%s", fmri); + (void) snprintf(srv, MAXPATHLEN, "%s", fmri); p = strstr(fmri, ":default"); if (p == NULL) { - strcat(srv, ":"); + (void) strcat(srv, ":"); if (instance == NULL) instance = "default"; if (strlen(srv) + strlen(instance) > MAXPATHLEN) goto out; - strncat(srv, instance, strlen(instance)); + (void) strncat(srv, instance, strlen(instance)); } svcname = srv; phandle = fs_smf_init(fmri, instance); @@ -312,7 +314,7 @@ fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf, } ret = 0; *bufsz = len; - break; + break; case SCF_TYPE_INTEGER: if (scf_value_get_integer(val, &valint) != 0) { ret = scf_error(); @@ -324,7 +326,7 @@ fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf, goto out; } ret = 0; - break; + break; case SCF_TYPE_BOOLEAN: if (scf_value_get_boolean(val, &bval) != 0) { ret = scf_error(); @@ -339,7 +341,9 @@ fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf, ret = SA_BAD_VALUE; goto out; } - break; + break; + default: + break; } } else { ret = scf_error(); |