X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=24e737b67e3995c8723cd1d7ae7f72899554c322;hb=050003ccbd8b314038352f55d9fae53245670e78;hp=299d65ebd287cf7fe1122fab1c25b37cb9a02360;hpb=3d986bb96e80823bccb013b6d72abe22c4911d51;p=paraslash.git

diff --git a/afs.c b/afs.c
index 299d65eb..24e737b6 100644
--- a/afs.c
+++ b/afs.c
@@ -564,7 +564,21 @@ int afs_cb_result_handler(struct osl_object *result, uint8_t band,
 	return send_sb(&cc->scc, result->data, result->size, band, true);
 }
 
-static void com_select_callback(int fd, const struct osl_object *query)
+void flush_and_free_pb(struct para_buffer *pb)
+{
+	int ret;
+	struct afs_max_size_handler_data *amshd = pb->private_data;
+
+	if (pb->buf && pb->size > 0) {
+		ret = pass_buffer_as_shm(amshd->fd, amshd->band, pb->buf,
+			pb->offset);
+		if (ret < 0)
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	}
+	free(pb->buf);
+}
+
+static int com_select_callback(int fd, const struct osl_object *query)
 {
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
@@ -575,11 +589,11 @@ static void com_select_callback(int fd, const struct osl_object *query)
 		.max_size_handler = afs_max_size_handler,
 	};
 	char *arg = query->data;
-	int num_admissible, ret, ret2;
+	int num_admissible, ret;
 
 	ret = clear_score_table();
 	if (ret < 0) {
-		ret2 = para_printf(&pb, "%s\n", para_strerror(-ret));
+		para_printf(&pb, "%s\n", para_strerror(-ret));
 		goto out;
 	}
 	if (current_play_mode == PLAY_MODE_MOOD)
@@ -588,23 +602,22 @@ static void com_select_callback(int fd, const struct osl_object *query)
 		playlist_close();
 	ret = activate_mood_or_playlist(arg, &num_admissible);
 	if (ret < 0) {
-		ret2 = para_printf(&pb, "%s\nswitching back to %s\n",
+		para_printf(&pb, "%s\nswitching back to %s\n",
 			para_strerror(-ret), current_mop?
 			current_mop : "dummy");
 		ret = activate_mood_or_playlist(current_mop, &num_admissible);
 		if (ret < 0) {
-			if (ret2 >= 0)
-				ret2 = para_printf(&pb, "failed, switching to dummy\n");
+			para_printf(&pb, "failed (%s), switching to dummy\n",
+				para_strerror(-ret));
 			activate_mood_or_playlist(NULL, &num_admissible);
 		}
 	} else
-		ret2 = para_printf(&pb, "activated %s (%d admissible files)\n",
+		para_printf(&pb, "activated %s (%d admissible files)\n",
 			current_mop?  current_mop : "dummy mood",
 			num_admissible);
 out:
-	if (ret2 >= 0 && pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
-	free(pb.buf);
+	flush_and_free_pb(&pb);
+	return 0;
 }
 
 int com_select(struct command_context *cc)
@@ -820,11 +833,6 @@ err:
 	return ret;
 }
 
-/*
- * On errors, negative value is written to fd.
- * On success: If query produced a result, the result_shmid is written to fd.
- * Otherwise, zero is written.
- */
 static int call_callback(int fd, int query_shmid)
 {
 	void *query_shm;
@@ -998,7 +1006,7 @@ out:
 	exit(EXIT_FAILURE);
 }
 
-static void create_tables_callback(int fd, const struct osl_object *query)
+static int create_tables_callback(int fd, const struct osl_object *query)
 {
 	uint32_t table_mask = *(uint32_t *)query->data;
 	int i, ret;
@@ -1027,9 +1035,8 @@ static void create_tables_callback(int fd, const struct osl_object *query)
 out:
 	if (ret < 0)
 		para_printf(&pb, "%s\n", para_strerror(-ret));
-	if (pb.buf)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
-	free(pb.buf);
+	flush_and_free_pb(&pb);
+	return 0;
 }
 
 int com_init(struct command_context *cc)
@@ -1057,9 +1064,8 @@ int com_init(struct command_context *cc)
 				return -E_BAD_TABLE_NAME;
 		}
 	}
-	ret = send_callback_request(create_tables_callback, &query,
+	return send_callback_request(create_tables_callback, &query,
 		afs_cb_result_handler, cc);
-	return ret;
 }
 
 /**