X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mood.c;h=fb988b2fa22e02c75dffa73a209fe393c115b0a9;hb=4ed1b8bcba134e2656eaff91053397064c538bd5;hp=8d171bde93170dd110ffe4d1b480dc313a8c61de;hpb=68630d8b55d688a7c7ce116951c310150aa9c166;p=paraslash.git

diff --git a/mood.c b/mood.c
index 8d171bde..fb988b2f 100644
--- a/mood.c
+++ b/mood.c
@@ -410,20 +410,18 @@ static int check_mood(struct osl_row *mood_row, void *data)
 	int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
 
 	if (ret < 0) {
-		para_printf(pb, "failed to get mood definition: %s\n",
-			para_strerror(-ret));
+		para_printf(pb, "cannot read mood\n");
 		return ret;
 	}
 	if (!*mood_name) /* ignore dummy row */
 		goto out;
-	ret = para_printf(pb, "checking mood %s...\n", mood_name);
-	if (ret < 0)
-		goto out;
+	para_printf(pb, "checking mood %s...\n", mood_name);
 	ret = for_each_line(FELF_READ_ONLY, mood_def.data, mood_def.size,
 		parse_mood_line, &mlpd);
 	if (ret < 0)
-		para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
-			para_strerror(-ret));
+		para_printf(pb, "mood %s: error in line %u: %s\n", mood_name,
+			mlpd.line_num, para_strerror(-ret));
+	ret = 1; /* don't fail the loop on invalid mood definitions */
 out:
 	osl_close_disk_object(&mood_def);
 	return ret;
@@ -434,9 +432,13 @@ out:
  *
  * \param fd The afs socket.
  * \param query Unused.
+ *
+ * \return Negative on fatal errors. Inconsistent mood definitions are not
+ * considered an error.
  */
-void mood_check_callback(int fd, __a_unused const struct osl_object *query)
+int mood_check_callback(int fd, __a_unused const struct osl_object *query)
 {
+	int ret;
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
 		.private_data = &(struct afs_max_size_handler_data) {
@@ -446,14 +448,11 @@ void mood_check_callback(int fd, __a_unused const struct osl_object *query)
 		.max_size_handler = afs_max_size_handler
 	};
 
-	int ret = para_printf(&pb, "checking moods...\n");
-	if (ret < 0)
-		return;
-	osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb,
-		check_mood);
-	if (pb.offset)
-		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
-	free(pb.buf);
+	para_printf(&pb, "checking moods...\n");
+	ret = osl(osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb,
+		check_mood));
+	flush_and_free_pb(&pb);
+	return ret;
 }
 
 static int64_t normalized_value(int64_t x, int64_t n, int64_t sum, int64_t qd)