Let afs_event() return int.

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index 82ac4dac87226fcc5482ea472574d9a486b62857..5bb14ed43d813b8dc01498c29541e8410d4262b4 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -280,7 +280,9 @@ static int com_addatt_callback(int fd, const struct osl_object *query)
                        goto out;
                aed.name = p;
                aed.bitnum = bitnum;
-               afs_event(ATTRIBUTE_ADD, &pb, &aed);
+               ret = afs_event(ATTRIBUTE_ADD, &pb, &aed);
+               if (ret < 0)
+                       goto out;
                greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum);
        }
 out:
@@ -328,73 +330,51 @@ static int com_mvatt_callback(int fd, const struct osl_object *query)
        ret = osl(osl_update_object(attribute_table, row, ATTCOL_NAME, &obj));
 out:
        if (ret < 0)
-               para_printf(&pb, "%s\n", para_strerror(-ret));
+               para_printf(&pb, "cannot rename %s to %s\n", old, new);
        else
-               afs_event(ATTRIBUTE_RENAME, &pb, NULL);
+               ret = afs_event(ATTRIBUTE_RENAME, &pb, NULL);
        flush_and_free_pb(&pb);
-       return 0;
+       return ret;
 }
 
 int com_mvatt(struct command_context *cc)
 {
-       int ret;
-
        if (cc->argc != 3)
                return -E_ATTR_SYNTAX;
-       ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+       return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
                com_mvatt_callback, afs_cb_result_handler, cc);
-       if (ret < 0)
-               send_strerror(cc, -ret);
-       return ret;
 }
 
-/** Data passed to the action handler of com_rmatt(). */
-struct remove_attribute_action_data {
-       /** Message buffer. */
-       struct para_buffer pb;
-       /** Number of attributes removed. */
-       int num_removed;
-       /** Bitwise "or" of the removed attributes. */
-       uint64_t mask_of_removed_atts;
-};
-
-/* returns succcess even on errors to keep the loop going */
 static int remove_attribute(struct osl_table *table, struct osl_row *row,
                const char *name, void *data)
 {
-       struct remove_attribute_action_data *raad = data;
+       struct para_buffer *pb = data;
        int ret;
        struct rmatt_event_data red = {.name = name};
 
        ret = get_attribute_bitnum_by_name(name, &red.bitnum);
        if (ret < 0) {
-               para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
-               return 0;
+               para_printf(pb, "cannot remove %s\n", name);
+               return ret;
        }
+       para_printf(pb, "removing attribute %s\n", name);
        ret = osl(osl_del_row(table, row));
        if (ret < 0) {
-               para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
-               return 0;
+               para_printf(pb, "cannot remove %s\n", name);
+               return ret;
        }
-       para_printf(&raad->pb, "removed attribute %s\n", name);
-       raad->num_removed++;
-       raad->mask_of_removed_atts |= (1 << red.bitnum);
-       afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red);
-       return 1;
+       return afs_event(ATTRIBUTE_REMOVE, pb, &red);
 }
 
 static int com_rmatt_callback(int fd, const struct osl_object *query)
 {
-       struct remove_attribute_action_data raad = {
-               .num_removed = 0,
-               .pb = {
-                       .max_size = shm_get_shmmax(),
-                       .private_data = &(struct afs_max_size_handler_data) {
-                               .fd = fd,
-                               .band = SBD_OUTPUT
-                       },
-                       .max_size_handler = afs_max_size_handler,
-               }
+       struct para_buffer pb = {
+               .max_size = shm_get_shmmax(),
+               .private_data = &(struct afs_max_size_handler_data) {
+                       .fd = fd,
+                       .band = SBD_OUTPUT
+               },
+               .max_size_handler = afs_max_size_handler,
        };
        int ret;
        struct pattern_match_data pmd = {
@@ -402,29 +382,25 @@ static int com_rmatt_callback(int fd, const struct osl_object *query)
                .patterns = *query,
                .loop_col_num = ATTCOL_BITNUM,
                .match_col_num = ATTCOL_NAME,
-               .data = &raad,
+               .data = &pb,
                .action = remove_attribute
        };
        ret = for_each_matching_row(&pmd);
        if (ret < 0)
-               para_printf(&raad.pb, "%s\n", para_strerror(-ret));
-       else if (!raad.num_removed)
-               para_printf(&raad.pb, "no match -- nothing removed\n");
-       flush_and_free_pb(&raad.pb);
-       return 0;
+               goto out;
+       if (pmd.num_matches == 0)
+               ret = -E_NO_MATCH;
+out:
+       flush_and_free_pb(&pb);
+       return ret;
 }
 
 int com_rmatt(struct command_context *cc)
 {
-       int ret;
-
        if (cc->argc < 2)
                return -E_ATTR_SYNTAX;
-       ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+       return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
                com_rmatt_callback, afs_cb_result_handler, cc);
-       if (ret < 0)
-               send_strerror(cc, -ret);
-       return ret;
 }
 
 /**