FEATURES: Fix a typo and use uniform capitalization for list items.

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index 03a832f..c4bc0bc 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -202,13 +202,17 @@ int com_lsatt(int fd, int argc, char * const * const argv)
        }
        ret = send_option_arg_callback_request(&options, argc - i, argv + i,
                com_lsatt_callback, &result);
        }
        ret = send_option_arg_callback_request(&options, argc - i, argv + i,
                com_lsatt_callback, &result);

-       if (ret > 0) {
-               ret = send_buffer(fd, (char *)result.data);
-               free(result.data);
-       } else if (ret < 0)
+       if (!ret) {
+               if (argc > 1)
+                       ret = send_va_buffer(fd, "no matches\n");
+               return ret;
+       }
+       if (ret < 0) {

                send_va_buffer(fd, "%s\n", para_strerror(-ret));
                send_va_buffer(fd, "%s\n", para_strerror(-ret));

-       else if (argc > 1)
-               send_va_buffer(fd, "no matches\n");
+               return ret;
+       }
+       ret = send_buffer(fd, (char *)result.data);
+       free(result.data);

        return ret;
 }
 
        return ret;
 }
 


@@ -482,11 +486,14 @@ int com_rmatt(int fd, int argc, char * const * const argv)
                return -E_ATTR_SYNTAX;
        ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
                &result);
                return -E_ATTR_SYNTAX;
        ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
                &result);

-       if (ret > 0) {
-               send_buffer(fd, (char *)result.data);
-               free(result.data);
-       } else
+       if (!ret)
+               return 0;
+       if (ret < 0) {

                send_va_buffer(fd, "%s\n", para_strerror(-ret));
                send_va_buffer(fd, "%s\n", para_strerror(-ret));

+               return ret;
+       }
+       ret = send_buffer(fd, (char *)result.data);
+       free(result.data);

        return ret;
 }
 
        return ret;
 }