X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=acb6c6bf879f838976652ca3c48cfbf3ff75f70c;hp=16de67634677c4ba75774bc9453ae427f4581a13;hb=050003ccbd8b314038352f55d9fae53245670e78;hpb=79bfc7a2a6577000c405be6344ba91ec3f8745e9;ds=sidebyside

diff --git a/aft.c b/aft.c
index 16de6763..acb6c6bf 100644
--- a/aft.c
+++ b/aft.c
@@ -1291,7 +1291,7 @@ err:
 	return ret;
 }
 
-static void com_ls_callback(int fd, const struct osl_object *query)
+static int com_ls_callback(int fd, const struct osl_object *query)
 {
 	struct ls_options *opts = query->data;
 	char *p, *pattern_start = (char *)query->data + sizeof(*opts);
@@ -1348,6 +1348,7 @@ out:
 	free(opts->data);
 	free(opts->data_ptr);
 	free(opts->patterns);
+	return 0;
 }
 
 /*
@@ -1612,7 +1613,7 @@ enum com_add_flags {
 	ADD_FLAG_ALL = 8,
 };
 
-static void com_add_callback(int fd, const struct osl_object *query)
+static int com_add_callback(int fd, const struct osl_object *query)
 {
 	char *buf = query->data, *path;
 	struct osl_row *pb, *aft_row;
@@ -1738,6 +1739,7 @@ out:
 	if (ret < 0)
 		para_printf(&msg, "%s\n", para_strerror(-ret));
 	flush_and_free_pb(&msg);
+	return 0;
 }
 
 /** Used by com_add(). */
@@ -1748,26 +1750,26 @@ struct private_add_data {
 	uint32_t flags;
 };
 
-static void path_brother_callback(int fd, const struct osl_object *query)
+static int path_brother_callback(int fd, const struct osl_object *query)
 {
 	char *path = query->data;
 	struct osl_row *path_brother;
 	int ret = aft_get_row_of_path(path, &path_brother);
 	if (ret < 0)
-		return;
-	pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&path_brother,
+		return ret;
+	return pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&path_brother,
 		sizeof(path_brother));
 }
 
-static void hash_sister_callback(int fd, const struct osl_object *query)
+static int hash_sister_callback(int fd, const struct osl_object *query)
 {
 	unsigned char *hash = query->data;
 	struct osl_row *hash_sister;
 
 	hash_sister = find_hash_sister(hash);
 	if (!hash_sister)
-		return;
-	pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister,
+		return 0;
+	return pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister,
 		sizeof(hash_sister));
 }
 
@@ -2009,7 +2011,7 @@ static int touch_audio_file(__a_unused struct osl_table *table,
 	return 1;
 }
 
-static void com_touch_callback(int fd, const struct osl_object *query)
+static int com_touch_callback(int fd, const struct osl_object *query)
 {
 	struct touch_action_data tad = {.cto = query->data,
 		.pb = {
@@ -2039,6 +2041,7 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 	else if (pmd.num_matches == 0)
 		para_printf(&tad.pb, "no matches\n");
 	flush_and_free_pb(&tad.pb);
+	return 0;
 }
 
 int com_touch(struct command_context *cc)
@@ -2148,7 +2151,7 @@ static int remove_audio_file(__a_unused struct osl_table *table,
 	return ret;
 }
 
-static void com_rm_callback(int fd, const struct osl_object *query)
+static int com_rm_callback(int fd, const struct osl_object *query)
 {
 	struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
 		.pb = {
@@ -2175,13 +2178,14 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0) {
 		para_printf(&crd.pb, "%s\n", para_strerror(-ret));
-		return;
+		return 0;
 	}
 	if ((pmd.num_matches == 0) && !(crd.flags & RM_FLAG_FORCE))
 		para_printf(&crd.pb, "no matches -- nothing removed\n");
 	else if (crd.flags & RM_FLAG_VERBOSE)
 		para_printf(&crd.pb, "removed %u files\n", pmd.num_matches);
 	flush_and_free_pb(&crd.pb);
+	return 0;
 }
 
 /* TODO options: -r (recursive) */
@@ -2285,7 +2289,7 @@ static int copy_selector_info(__a_unused struct osl_table *table,
 	return 1;
 }
 
-static void com_cpsi_callback(int fd, const struct osl_object *query)
+static int com_cpsi_callback(int fd, const struct osl_object *query)
 {
 	struct cpsi_action_data cad = {
 		.flags = *(unsigned *)query->data,
@@ -2325,6 +2329,7 @@ out:
 	} else
 		para_printf(&cad.pb, "no matches - nothing copied\n");
 	flush_and_free_pb(&cad.pb);
+	return 0;
 }
 
 int com_cpsi(struct command_context *cc)
@@ -2409,7 +2414,7 @@ static int change_atts(__a_unused struct osl_table *table,
 	return 1;
 }
 
-static void com_setatt_callback(int fd, const struct osl_object *query)
+static int com_setatt_callback(int fd, const struct osl_object *query)
 {
 	char *p;
 	int ret;
@@ -2470,6 +2475,7 @@ out:
 	if (ret < 0)
 		para_printf(&cad.pb, "%s\n", para_strerror(-ret));
 	flush_and_free_pb(&cad.pb);
+	return 0;
 }
 
 int com_setatt(struct command_context *cc)
@@ -2480,15 +2486,15 @@ int com_setatt(struct command_context *cc)
 		com_setatt_callback, afs_cb_result_handler, cc);
 }
 
-static void afs_stat_callback(int fd, const struct osl_object *query)
+static int afs_stat_callback(int fd, const struct osl_object *query)
 {
 	int *parser_friendly = query->data;
 	char *buf = *parser_friendly?
 		parser_friendly_status_items : status_items;
 
 	if (!buf)
-		return;
-	pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf));
+		return 0;
+	return pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf));
 }
 
 /**
@@ -2554,11 +2560,11 @@ static int check_audio_file(struct osl_row *row, void *data)
  * \param fd The afs socket.
  * \param query Unused.
  *
- * This function always succeeds.
+ * \return This function always returns zero.
  *
  * \sa com_check().
  */
-void aft_check_callback(int fd, __a_unused const struct osl_object *query)
+int aft_check_callback(int fd, __a_unused const struct osl_object *query)
 {
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
@@ -2571,6 +2577,7 @@ void aft_check_callback(int fd, __a_unused const struct osl_object *query)
 	para_printf(&pb, "checking audio file table...\n");
 	audio_file_loop(&pb, check_audio_file);
 	flush_and_free_pb(&pb);
+	return 0;
 }
 
 /**