make send_callback_request() and friends take a result handler.

[paraslash.git] / mood.c

diff --git a/mood.c b/mood.c
index 9ddfc58853574a09d4d0073b052df14bced7054a..2e562f4fefdd0a559aa37329ddafddfd2d861316 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -520,7 +520,7 @@ static int load_mood(const struct osl_row *mood_row, struct mood **m)
        osl_close_disk_object(&mood_def);
        if (ret < 0) {
                PARA_ERROR_LOG("unable to load mood %s: %s\n", mlpd.m->name,
-                       PARA_STRERROR(-ret));
+                       para_strerror(-ret));
                destroy_mood(mlpd.m);
                return ret;
        }
@@ -548,7 +548,7 @@ static int check_mood(struct osl_row *mood_row, void *data)
                parse_mood_line, &mlpd);
        if (ret < 0)
                para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
-                       PARA_STRERROR(-ret));
+                       para_strerror(-ret));
 out:
        osl_close_disk_object(&mood_def);
        return 1;
@@ -569,7 +569,7 @@ int mood_check_callback(__a_unused const struct osl_object *query,
        osl_rbtree_loop(moods_table, BLOBCOL_ID, &pb,
                check_mood);
        result->data = pb.buf;
-       result->size = pb.size;
+       result->size = pb.offset;
        return 1;
 }
 
@@ -1013,9 +1013,10 @@ int reload_current_mood(void)
        int ret;
        char *mood_name = NULL;
 
-       PARA_NOTICE_LOG("reloading current mood\n");
        if (!current_mood)
                return 1;
+       PARA_NOTICE_LOG("reloading %s\n", current_mood->name?
+               current_mood->name : "(dummy)");
        if (current_mood->name)
                mood_name = para_strdup(current_mood->name);
        close_current_mood();
@@ -1057,6 +1058,5 @@ int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb
        default:
                return 1;
        }
-       return 1;
 }