X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=8675ee73330fb1f87a1f4ef0a2780b445a2a7b5b;hp=2abf26283f599327398c0558270e0cb29f4f611a;hb=9492ba2d1b8f21af37436b121569e51a9b1df0c0;hpb=c2ac39f76d245816a919d94790672fb66e9a7253

diff --git a/blob.c b/blob.c
index 2abf2628..8675ee73 100644
--- a/blob.c
+++ b/blob.c
@@ -54,7 +54,9 @@ enum blob_ls_flags {
 
 /** Structure passed to the \p print_blob function. */
 struct lsblob_action_data {
+	/* The flags given at the command line. */
 	uint32_t flags;
+	/** Message buffer. */
 	struct para_buffer pb;
 };
 
@@ -98,9 +100,9 @@ static int com_lsblob_callback(struct osl_table *table,
 	if (lbad.flags & BLOB_LS_FLAG_REVERSE)
 		pmd.pm_flags |= PM_REVERSE_LOOP;
 	if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID))
-		pmd.loop_col_num = BLOBCOL_ID;
-	else
 		pmd.loop_col_num = BLOBCOL_NAME;
+	else
+		pmd.loop_col_num = BLOBCOL_ID;
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
 		para_printf(&lbad.pb, "%s\n", PARA_STRERROR(-ret));
@@ -205,8 +207,11 @@ static int com_catblob(callback_function *f, int fd, int argc,
 	return ret;
 }
 
+/** Used for removing rows from a blob table. */
 struct rmblob_data {
+	/** Message buffer. */
 	struct para_buffer pb;
+	/** Number of removed blobs. */
 	unsigned num_removed;
 };
 
@@ -225,7 +230,7 @@ static int remove_blob(struct osl_table *table, struct osl_row *row,
 
 static int com_rmblob_callback(struct osl_table *table,
 		const struct osl_object *query,
-		__a_unused struct osl_object *result)
+		struct osl_object *result)
 {
 	int ret;
 	struct rmblob_data rmbd = {.num_removed = 0};
@@ -244,14 +249,16 @@ static int com_rmblob_callback(struct osl_table *table,
 		para_printf(&rmbd.pb, "%s\n", PARA_STRERROR(-ret));
 	if (!rmbd.num_removed)
 		para_printf(&rmbd.pb, "no matches, nothing removed\n");
-	else
+	else {
 		para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);
+		afs_event(BLOB_RENAME, NULL, table);
+	}
 	result->data = rmbd.pb.buf;
 	result->size = rmbd.pb.size;
 	return 1;
 }
 
-static int com_rmblob(callback_function *f, __a_unused int fd, int argc,
+static int com_rmblob(callback_function *f, int fd, int argc,
 		char * const * const argv)
 {
 	int ret;
@@ -328,7 +335,11 @@ static int com_addblob_callback(struct osl_table *table,
 	objs[BLOBCOL_NAME].size = name_len;
 	objs[BLOBCOL_DEF].data = name + name_len;
 	objs[BLOBCOL_DEF].size = query->size - name_len;
-	return osl_add_row(table, objs);
+	ret = osl_add_row(table, objs);
+	if (ret < 0)
+		return ret;
+	afs_event(BLOB_ADD, NULL, table);
+	return 1;
 }
 
 static int com_addblob(callback_function *f, int fd, int argc,
@@ -360,10 +371,14 @@ static int com_mvblob_callback(struct osl_table *table,
 		return ret;
 	obj.data = dest;
 	obj.size = strlen(dest) + 1;
-	return osl_update_object(table, row, BLOBCOL_NAME, &obj);
+	ret = osl_update_object(table, row, BLOBCOL_NAME, &obj);
+	if (ret < 0)
+		return ret;
+	afs_event(BLOB_RENAME, NULL, table);
+	return 1;
 }
 
-static int com_mvblob(callback_function *f,  __a_unused int fd,
+static int com_mvblob(callback_function *f, __a_unused int fd,
 		int argc, char * const * const argv)
 {
 	if (argc != 3)
@@ -524,6 +539,7 @@ static int blob_open(struct osl_table **table,
 		t->close = table_name ## _close; \
 		t->create = table_name ## _create;\
 		t->event_handler = table_name ##_event_handler; \
+		table_name ## _table = NULL; \
 	}