diff options
| -rw-r--r-- | usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c | 9 | ||||
| -rw-r--r-- | usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c | 7 | ||||
| -rw-r--r-- | usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c | 9 | ||||
| -rw-r--r-- | usr/src/uts/common/io/hook.c | 2 |
4 files changed, 12 insertions, 15 deletions
diff --git a/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c b/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c index 6186f187e0..e9585ef40a 100644 --- a/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c +++ b/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c @@ -21,6 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. */ #include "cfga_ib.h" @@ -73,7 +74,7 @@ void cfga_msg(struct cfga_msg *, const char *); cfga_err_t cfga_help(struct cfga_msg *, const char *, cfga_flags_t); static int ib_confirm(struct cfga_confirm *, char *); -static char *ib_get_devicepath(const char *); +static char *ib_get_devicepath(const char *); /* External function prototypes */ @@ -194,7 +195,7 @@ static char *ib_service_subopts[] = { /* Communication Service name : "port" or "vppa" or "hca-svc" */ static char *comm_name = NULL; -char *service_name = NULL; /* service name */ +char *service_name = NULL; /* service name */ ib_service_type_t service_type = IB_NONE; /* service type */ @@ -1654,14 +1655,12 @@ cfga_list_ext(const char *ap_id, cfga_list_data_t **ap_id_list, int *nlistp, cfga_list_data_t *clp = NULL; if ((rv = ib_verify_params(ap_id, options, errstring)) != CFGA_IB_OK) { - (void) cfga_help(NULL, options, flags); return (ib_err_msg(errstring, rv, ap_id, errno)); } /* make sure we have a valid ap_id_list */ if (ap_id_list == NULL || nlistp == NULL) { DPRINTF("cfga_list_ext: list = NULL or nlistp = NULL\n"); - (void) cfga_help(NULL, options, flags); return (ib_err_msg(errstring, CFGA_IB_INVAL_ARG_ERR, ap_id, errno)); } @@ -1717,7 +1716,7 @@ cfga_list_ext(const char *ap_id, cfga_list_data_t **ap_id_list, int *nlistp, /* * *nlistp contains to how many APIDs to show w/ cfgadm -l. * If ap_id is "fabric" then - * *nlistp is all Dynamic Apids + One more for "fabric" + * *nlistp is all Dynamic Apids + One more for "fabric" * If ap_id is "HCA" ap_id then * *nlistp is 1 * Note that each HCA is a static APID, so nlistp will be 1 always diff --git a/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c b/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c index 29f059b2db..ad4dcd6dd3 100644 --- a/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c +++ b/usr/src/lib/cfgadm_plugins/sata/common/cfga_sata.c @@ -22,6 +22,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. */ #include <sys/param.h> @@ -570,7 +571,7 @@ cfga_change_state( cfga_flags_t flags) { int ret; - int len; + int len; char *msg; char *devpath; nvlist_t *nvl = NULL; @@ -922,7 +923,7 @@ cfga_private_func( cfga_flags_t flags) { int len; - char *msg; + char *msg; nvlist_t *list = NULL; ap_ostate_t ostate; ap_rstate_t rstate; @@ -1430,7 +1431,6 @@ cfga_list_ext( if ((rv = verify_params(ap_id, options, errstring)) != CFGA_SATA_OK) { - (void) cfga_help(NULL, options, flags); goto bailout; } /* We do not care here about dynamic AP name component */ @@ -1440,7 +1440,6 @@ cfga_list_ext( if (ap_id_list == NULL || nlistp == NULL) { rv = CFGA_SATA_DATA_ERROR; - (void) cfga_help(NULL, options, flags); goto bailout; } diff --git a/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c b/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c index e570daeeb3..cfb0b63232 100644 --- a/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c +++ b/usr/src/lib/cfgadm_plugins/usb/common/cfga_usb.c @@ -21,6 +21,7 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. */ @@ -36,7 +37,7 @@ extern cfga_usb_ret_t usb_rcm_online(const char *, char **, char *, extern cfga_usb_ret_t usb_rcm_remove(const char *, char **, char *, cfga_flags_t); static int usb_confirm(struct cfga_confirm *, char *); -static char *usb_get_devicepath(const char *); +static char *usb_get_devicepath(const char *); /* * This file contains the entry points to the plugin as defined in the @@ -621,7 +622,7 @@ device_connected(devctl_hdl_t hdl, nvlist_t *list, ap_ostate_t *ostate) */ cfga_usb_ret_t do_control_ioctl(const char *ap_id, uint_t subcommand, uint_t arg, - void **descrp, size_t *sizep) + void **descrp, size_t *sizep) { int fd = -1; uint_t port; @@ -1224,7 +1225,7 @@ cfga_private_func( char *msg; nvlist_t *list = NULL; ap_ostate_t ostate; - devctl_hdl_t hdl = NULL; + devctl_hdl_t hdl = NULL; cfga_usb_ret_t rv; usb_dev_descr_t *dev_descrp = NULL; char *driver = NULL; @@ -1474,14 +1475,12 @@ cfga_list_ext( DPRINTF("cfga_list_ext:\n"); if ((rv = verify_params(ap_id, options, errstring)) != CFGA_USB_OK) { - (void) cfga_help(NULL, options, flags); goto bailout; } if (ap_id_list == NULL || nlistp == NULL) { DPRINTF("cfga_list_ext: list = NULL or nlistp = NULL\n"); rv = CFGA_USB_INTERNAL_ERROR; - (void) cfga_help(NULL, options, flags); goto bailout; } diff --git a/usr/src/uts/common/io/hook.c b/usr/src/uts/common/io/hook.c index cf075f27c9..6726f72147 100644 --- a/usr/src/uts/common/io/hook.c +++ b/usr/src/uts/common/io/hook.c @@ -754,7 +754,7 @@ hook_stack_notify_unregister(netstackid_t stackid, hook_notify_fn_t callback) } } else { /* - * hook_notify_register() should only fail if the callback has + * hook_notify_unregister() should only fail if the callback has * already been deleted (ESRCH). */ VERIFY3S(error, ==, ESRCH); |