X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=0b2a4765b16f82fbde4674ac230bda4d2b5f9e18;hp=ea0a9f9f310d55f3e4fc56377a3583937e1bd92d;hb=79bfc7a2a6577000c405be6344ba91ec3f8745e9;hpb=bb3daee7cc11561159f168fe4f5427b53e54917f

diff --git a/afs.c b/afs.c
index ea0a9f9f..0b2a4765 100644
--- a/afs.c
+++ b/afs.c
@@ -365,8 +365,11 @@ static int action_if_pattern_matches(struct osl_row *row, void *data)
 	name = (char *)name_obj.data;
 	if ((!name || !*name) && (pmd->pm_flags & PM_SKIP_EMPTY_NAME))
 		return 1;
-	if (!pmd->patterns.size && (pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING))
+	if (pmd->patterns.size == 0 &&
+			(pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING)) {
+		pmd->num_matches++;
 		return pmd->action(pmd->table, row, name, pmd->data);
+	}
 	for (p = pattern_txt; p < pattern_txt + pmd->patterns.size;
 			p += strlen(p) + 1) {
 		ret = fnmatch(p, name, pmd->fnmatch_flags);
@@ -561,6 +564,20 @@ int afs_cb_result_handler(struct osl_object *result, uint8_t band,
 	return send_sb(&cc->scc, result->data, result->size, band, true);
 }
 
+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 void com_select_callback(int fd, const struct osl_object *query)
 {
 	struct para_buffer pb = {
@@ -572,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)
@@ -585,23 +602,21 @@ 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);
 }
 
 int com_select(struct command_context *cc)
@@ -817,11 +832,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;
@@ -1024,9 +1034,7 @@ 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);
 }
 
 int com_init(struct command_context *cc)
@@ -1054,9 +1062,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;
 }
 
 /**