X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=2f9df84581ee53685bbdb2282b6398a133fbf37f;hp=2f521291096eeb3703c9f091ebb739060e68bb6e;hb=761d9bd95a6601c0b3be6591a6b6672b755e1fbe;hpb=58864df1c0784c58e421949b67a091fd0a60e140

diff --git a/afs.c b/afs.c
index 2f521291..2f9df845 100644
--- a/afs.c
+++ b/afs.c
@@ -546,6 +546,28 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 	return 1;
 }
 
+/**
+ * Result handler for sending data to the para_client process.
+ *
+ * \param result The data to be sent.
+ * \param band The band designator.
+ * \param private Pointer to the command context.
+ *
+ * \return The return value of the underlying call to \ref command.c::send_sb.
+ *
+ * \sa \ref callback_result_handler, \ref command.c::send_sb.
+ */
+int afs_cb_result_handler(struct osl_object *result, uint8_t band,
+		void *private)
+{
+	struct command_context *cc = private;
+
+	assert(cc);
+	if (!result->size)
+		return 1;
+	return send_sb(&cc->scc, result->data, result->size, band, true);
+}
+
 static void com_select_callback(int fd, const struct osl_object *query)
 {
 	struct para_buffer pb = {
@@ -588,31 +610,6 @@ out:
 	free(pb.buf);
 }
 
-/**
- * Result handler for sending data to the para_client process.
- *
- * \param result The data to be sent.
- * \param band The band designator.
- * \param private Pointer to the command context.
- *
- * \return The return value of the underlying call to \ref command.c::send_sb.
- *
- * \sa \ref callback_result_handler, \ref command.c::send_sb.
- */
-int afs_cb_result_handler(struct osl_object *result, uint8_t band,
-		void *private)
-{
-	struct command_context *cc = private;
-
-	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);
-}
-
 int com_select(struct command_context *cc)
 {
 	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;
 }