New upstream version 0.7.6

[mirror_zfs-debian.git] / lib / libshare / libshare.c

diff --git a/lib/libshare/libshare.c b/lib/libshare/libshare.c
index aa565ca828622f6cc207288aee60cb9bf2f99c1e..022df016f26d895ea9fdd80aa2cbc7e898fc345b 100644 (file)
--- 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));
 }