com_mvatt(): Return negative on errors

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index 82ac4dac87226fcc5482ea472574d9a486b62857..70e35ae58f572308cb1a4a32266e122007e5a05c 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -328,24 +328,19 @@ 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);
        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(). */