X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=afs.c;h=d02082666cc48baee0bbb39db7c22a6a0ec2265e;hb=4a55942a597fc7c828a30557e6621debe5c37481;hp=c87fdf78fb9bf60d413503f557cac34573b50edf;hpb=d2a4829af865fb5ad698dfda5796e74c2e4e9f76;p=paraslash.git

diff --git a/afs.c b/afs.c
index c87fdf78..d0208266 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -565,10 +565,7 @@ int afs_cb_result_handler(struct osl_object *result, uint8_t band,
 	assert(cc);
 	if (!result->size)
 		return 1;
-	if (cc->use_sideband)
-		return send_sb(&cc->scc, result->data, result->size, band,
-			true);
-	return sc_send_bin_buffer(&cc->scc, result->data, result->size);
+	return send_sb(&cc->scc, result->data, result->size, band, true);
 }
 
 static void com_select_callback(int fd, const struct osl_object *query)
@@ -807,7 +804,7 @@ static void command_pre_select(struct sched *s, struct task *t)
  * \return Zero if \a buf is \p NULL or \a size is zero. Negative on errors,
  * and positive on success.
  */
-int pass_buffer_as_shm(int fd, uint8_t band, char *buf, size_t size)
+int pass_buffer_as_shm(int fd, uint8_t band, const char *buf, size_t size)
 {
 	int ret, shmid;
 	void *shm;
@@ -1068,9 +1065,6 @@ int com_init(struct command_context *cc)
 	}
 	ret = send_callback_request(create_tables_callback, &query,
 		afs_cb_result_handler, cc);
-	if (ret < 0 && !cc->use_sideband)
-		/* ignore return value */
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
 }