diff options
author | Brian Behlendorf <[email protected]> | 2017-11-18 14:08:00 -0800 |
---|---|---|
committer | GitHub <[email protected]> | 2017-11-18 14:08:00 -0800 |
commit | 94183a9d8a1133ff0d29666a86f84c24f2c4083c (patch) | |
tree | cb6ad00a71574e618efc4e964f2b1b9b4f89b5bf /lib/libshare/libshare.c | |
parent | 8d187769736688044c3c58a6a56069a54210a656 (diff) |
Update for cppcheck v1.80
Resolve new warnings and errors from cppcheck v1.80.
* [lib/libshare/libshare.c:543]: (warning)
Possible null pointer dereference: protocol
* [lib/libzfs/libzfs_dataset.c:2323]: (warning)
Possible null pointer dereference: srctype
* [lib/libzfs/libzfs_import.c:318]: (error)
Uninitialized variable: link
* [module/zfs/abd.c:353]: (error) Uninitialized variable: sg
* [module/zfs/abd.c:353]: (error) Uninitialized variable: i
* [module/zfs/abd.c:385]: (error) Uninitialized variable: sg
* [module/zfs/abd.c:385]: (error) Uninitialized variable: i
* [module/zfs/abd.c:553]: (error) Uninitialized variable: i
* [module/zfs/abd.c:553]: (error) Uninitialized variable: sg
* [module/zfs/abd.c:763]: (error) Uninitialized variable: i
* [module/zfs/abd.c:763]: (error) Uninitialized variable: sg
* [module/zfs/abd.c:305]: (error) Uninitialized variable: tmp_page
* [module/zfs/zpl_xattr.c:342]: (warning)
Possible null pointer dereference: value
* [module/zfs/zvol.c:208]: (error) Uninitialized variable: p
Convert the following suppression to inline.
* [module/zfs/zfs_vnops.c:840]: (error)
Possible null pointer dereference: aiov
Exclude HAVE_UIO_ZEROCOPY and HAVE_DNLC from analysis since
these macro's will never be defined until this functionality
is implemented.
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #6879
Diffstat (limited to 'lib/libshare/libshare.c')
-rw-r--r-- | lib/libshare/libshare.c | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/lib/libshare/libshare.c b/lib/libshare/libshare.c index aa565ca82..022df016f 100644 --- a/lib/libshare/libshare.c +++ b/lib/libshare/libshare.c @@ -493,20 +493,10 @@ int sa_enable_share(sa_share_t share, char *protocol) { sa_share_impl_t impl_share = (sa_share_impl_t)share; - int rc, ret; - boolean_t found_protocol; + int rc, ret = SA_OK; + boolean_t found_protocol = B_FALSE; sa_fstype_t *fstype; -#ifdef DEBUG - fprintf(stderr, "sa_enable_share: share->sharepath=%s, protocol=%s\n", - impl_share->sharepath, protocol); -#endif - - assert(impl_share->handle != NULL); - - ret = SA_OK; - found_protocol = B_FALSE; - fstype = fstypes; while (fstype != NULL) { if (protocol == NULL || strcmp(fstype->name, protocol) == 0) { @@ -534,18 +524,10 @@ int sa_disable_share(sa_share_t share, char *protocol) { sa_share_impl_t impl_share = (sa_share_impl_t)share; - int rc, ret; - boolean_t found_protocol; + int rc, ret = SA_OK; + boolean_t found_protocol = B_FALSE; sa_fstype_t *fstype; -#ifdef DEBUG - fprintf(stderr, "sa_disable_share: share->sharepath=%s, protocol=%s\n", - impl_share->sharepath, protocol); -#endif - - ret = SA_OK; - found_protocol = B_FALSE; - fstype = fstypes; while (fstype != NULL) { if (protocol == NULL || strcmp(fstype->name, protocol) == 0) { @@ -696,11 +678,6 @@ sa_parse_legacy_options(sa_group_t group, char *options, char *proto) { sa_fstype_t *fstype; -#ifdef DEBUG - fprintf(stderr, "sa_parse_legacy_options: options=%s, proto=%s\n", - options, proto); -#endif - fstype = fstypes; while (fstype != NULL) { if (strcmp(fstype->name, proto) != 0) { @@ -787,12 +764,6 @@ sa_zfs_process_share(sa_handle_t handle, sa_group_t group, sa_share_t share, sa_handle_impl_t impl_handle = (sa_handle_impl_t)handle; sa_share_impl_t impl_share = (sa_share_impl_t)share; -#ifdef DEBUG - fprintf(stderr, "sa_zfs_process_share: mountpoint=%s, proto=%s, " - "shareopts=%s, sourcestr=%s, dataset=%s\n", mountpoint, proto, - shareopts, sourcestr, dataset); -#endif - return (process_share(impl_handle, impl_share, mountpoint, NULL, proto, shareopts, NULL, dataset, B_FALSE)); } |