From 6b9707e20a57b750853358f39e231ce262270b34 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 5 Apr 2015 15:34:39 +0000 Subject: [PATCH] com_mvblob(): Return negative on errors --- blob.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/blob.c b/blob.c index 6e48c487..fbfea00c 100644 --- a/blob.c +++ b/blob.c @@ -479,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) \ -- 2.39.5