X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=33a6f63ba29a9bf8b0056d64e567972fab4b853a;hp=6e48c487eb6b975ebf740561146374af122d1479;hb=e469622d99718d49158d5da649eb02180269b4c8;hpb=134e02f7e90d37a3056198d8ba374e0271415d15

diff --git a/blob.c b/blob.c
index 6e48c487..33a6f63b 100644
--- a/blob.c
+++ b/blob.c
@@ -171,7 +171,7 @@ out:
 	return ret;
 }
 
-static int com_lsblob(callback_function *f, struct command_context *cc)
+static int com_lsblob(afs_callback *f, struct command_context *cc)
 {
 	uint32_t flags = 0;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
@@ -241,7 +241,7 @@ static int com_catblob_callback(struct osl_table *table, int fd,
 	return ret;
 }
 
-static int com_catblob(callback_function *f, struct command_context *cc)
+static int com_catblob(afs_callback *f, struct command_context *cc)
 {
 	if (cc->argc < 2)
 		return -E_BLOB_SYNTAX;
@@ -289,14 +289,14 @@ static int com_rmblob_callback(struct osl_table *table, int fd,
 		ret = -E_NO_MATCH;
 	else {
 		para_printf(&pb, "removed %d blob(s)\n", pmd.num_matches);
-		afs_event(BLOB_RENAME, NULL, table);
+		ret = afs_event(BLOB_RENAME, NULL, table);
 	}
 out:
 	flush_and_free_pb(&pb);
 	return ret;
 }
 
-static int com_rmblob(callback_function *f, struct command_context *cc)
+static int com_rmblob(afs_callback *f, struct command_context *cc)
 {
 	if (cc->argc < 2)
 		return -E_MOOD_SYNTAX;
@@ -371,7 +371,7 @@ static int com_addblob_callback(struct osl_table *table, int fd,
 	ret = osl(osl_add_row(table, objs));
 	if (ret < 0)
 		goto out;
-	afs_event(BLOB_ADD, NULL, table);
+	ret = afs_event(BLOB_ADD, NULL, table);
 out:
 	if (ret < 0)
 		msg_len = xasprintf(&msg, "cannot add %s\n", name);
@@ -428,7 +428,7 @@ again:
  * afs process via the callback method.
  */
 static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
-		callback_function *f)
+		afs_callback *f)
 {
 	struct osl_object query, stdin_obj;
 	int ret;
@@ -451,7 +451,7 @@ static int stdin_command(struct command_context *cc, struct osl_object *arg_obj,
 	return ret;
 }
 
-static int com_addblob(callback_function *f, struct command_context *cc)
+static int com_addblob(afs_callback *f, struct command_context *cc)
 {
 	struct osl_object arg_obj;
 
@@ -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);
+	ret = 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)
+static int com_mvblob(afs_callback *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) \