X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=aft.c;h=fb40a7be164232cf884a0a409272e5f34dedc3b9;hb=2830b9f8;hp=dffe3a31526529b78099c3b1339710939b4309bc;hpb=68cb0aef88594f3dea1f7dfdc279f125bf5bbecc;p=paraslash.git

diff --git a/aft.c b/aft.c
index dffe3a31..fb40a7be 100644
--- a/aft.c
+++ b/aft.c
@@ -21,6 +21,7 @@
 #include "fd.h"
 #include "ipc.h"
 #include "portable_io.h"
+#include "sideband.h"
 #include "command.h"
 
 static struct osl_table *audio_file_table;
@@ -1520,7 +1521,7 @@ int com_ls(struct command_context *cc)
 	opts.mode = mode;
 	opts.num_patterns = cc->argc - i;
 	ret = send_option_arg_callback_request(&query, opts.num_patterns,
-		cc->argv + i, com_ls_callback, sc_send_result, cc);
+		cc->argv + i, com_ls_callback, afs_cb_result_handler, cc);
 	return ret;
 }
 
@@ -1913,7 +1914,8 @@ static int add_one_audio_file(const char *path, void *private_data)
 	}
 	save_add_callback_buffer(hash, path, afhi_ptr, pad->flags, format_num, &obj);
 	/* Ask afs to consider this entry for adding. */
-	ret = send_callback_request(com_add_callback, &obj, sc_send_result, pad->cc);
+	ret = send_callback_request(com_add_callback, &obj,
+		afs_cb_result_handler, pad->cc);
 	goto out_free;
 
 out_unmap:
@@ -2185,7 +2187,7 @@ int com_touch(struct command_context *cc)
 	if (i >= cc->argc)
 		return -E_AFT_SYNTAX;
 	ret = send_option_arg_callback_request(&query, cc->argc - i,
-		cc->argv + i, com_touch_callback, sc_send_result, cc);
+		cc->argv + i, com_touch_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
 		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
@@ -2296,7 +2298,7 @@ int com_rm(struct command_context *cc)
 	if (i >= cc->argc)
 		return -E_AFT_SYNTAX;
 	ret = send_option_arg_callback_request(&query, cc->argc - i,
-		cc->argv + i, com_rm_callback, sc_send_result, cc);
+		cc->argv + i, com_rm_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
 		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
@@ -2455,7 +2457,7 @@ int com_cpsi(struct command_context *cc)
 	if (!(flags & ~CPSI_FLAG_VERBOSE)) /* no copy flags given */
 		flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags;
 	ret = send_option_arg_callback_request(&options, cc->argc - i,
-		cc->argv + i, com_cpsi_callback, sc_send_result, cc);
+		cc->argv + i, com_cpsi_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
 		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
@@ -2491,7 +2493,8 @@ int send_afs_status(struct command_context *cc, int parser_friendly)
 	struct osl_object query = {.data = &parser_friendly,
 		.size = sizeof(parser_friendly)};
 
-	return send_callback_request(afs_stat_callback, &query, sc_send_result, cc);
+	return send_callback_request(afs_stat_callback, &query,
+		afs_cb_result_handler, cc);
 }
 
 /* TODO: optionally fix problems by removing offending rows */