mood_check_callback(): Return negative on errors

[paraslash.git] / blob.c

diff --git a/blob.c b/blob.c
index ea746072d85b4493ec3c03313f8f8d3c74df191e..fbfea00ce90a2ac4bf49c5b8e7002248d5c329e0 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -374,13 +374,12 @@ static int com_addblob_callback(struct osl_table *table, int fd,
        afs_event(BLOB_ADD, NULL, table);
 out:
        if (ret < 0)
-               msg_len = xasprintf(&msg, "could not add %s: %s\n", name,
-                       para_strerror(-ret));
+               msg_len = xasprintf(&msg, "cannot add %s\n", name);
        else
                msg_len = xasprintf(&msg, "added %s as id %u\n", name, id);
        pass_buffer_as_shm(fd, SBD_OUTPUT, msg, msg_len);
        free(msg);
-       return 0;
+       return ret;
 }
 
 /* Write input from fd to dynamically allocated buffer, but maximal 10M. */
@@ -480,35 +479,28 @@ static int com_mvblob_callback(struct osl_table *table, int fd,
        int ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row));
 
        if (ret < 0) {
-               para_printf(&pb, "could not locate %s: %s\n", src,
-                       para_strerror(-ret));
+               para_printf(&pb, "cannot find source blob %s\n", src);
                goto out;
        }
        obj.data = dest;
        obj.size = strlen(dest) + 1;
        ret = osl(osl_update_object(table, row, BLOBCOL_NAME, &obj));
        if (ret < 0) {
-               para_printf(&pb, "failed to update object %s: %s\n", dest,
-                       para_strerror(-ret));
+               para_printf(&pb, "cannot rename blob %s to %s\n", src, dest);
                goto out;
        }
        afs_event(BLOB_RENAME, NULL, table);
 out:
        flush_and_free_pb(&pb);
-       return 0;
+       return ret;
 }
 
 static int com_mvblob(callback_function *f, struct command_context *cc)
 {
-       int ret;
-
        if (cc->argc != 3)
                return -E_MOOD_SYNTAX;
-       ret = send_option_arg_callback_request(NULL, cc->argc - 1,
+       return send_option_arg_callback_request(NULL, cc->argc - 1,
                cc->argv + 1, f, afs_cb_result_handler, cc);
-       if (ret < 0)
-               send_strerror(cc, -ret);
-       return ret;
 }
 
 #define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \