Merge branch 't/doc'

diff --git a/NEWS b/NEWS
index 4863abe4ddf4db3403067c0c8bd1d329020950e6..dfe779eed74299064a1f0648b364781244a2ccda 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
 0.4.11 (to be announced "mutual diversity")
 -------------------------------------------
 
+       - Documentation improvements.
 ------------------------------------------
 0.4.10 (2012-03-30) "heterogeneous vacuum"
 ------------------------------------------

diff --git a/afh.c b/afh.c
index bffe63216e71627dde4b4b49b53c436388500444..5b1cfe9bd1bd367939b9df2ddce2e4069c6df70d 100644 (file)
--- a/afh.c
+++ b/afh.c
@@ -18,9 +18,6 @@
 #include "version.h"
 
 static struct afh_args_info conf;
-/** The list of all status items */
-const char *status_item_list[] = {STATUS_ITEM_ARRAY};
-
 INIT_AFH_ERRLISTS;
 
 static int loglevel;
@@ -207,13 +204,7 @@ int main(int argc, char **argv)
                                print_chunk_table(&afhi);
                        printf("\n");
                }
-               free(afhi.techinfo);
-               free(afhi.tags.artist);
-               free(afhi.tags.title);
-               free(afhi.tags.year);
-               free(afhi.tags.album);
-               free(afhi.tags.comment);
-               free(afhi.chunk_table);
+               clear_afhi(&afhi);
                ret2 = para_munmap(audio_file_data, audio_file_size);
                if (ret2 < 0 && ret >= 0)
                        ret = ret2;

diff --git a/afh.h b/afh.h
index a574edf5899f9f43c4abd0f2e6fc39085bb49854..7952809436752f19a795362469291a4996f0d468 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -104,3 +104,4 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
 void afh_get_header(struct afh_info *afhi, uint8_t audio_format_id,
                void *map, size_t mapsize, char **buf, size_t *len);
 void afh_free_header(char *header_buf, uint8_t audio_format_id);
+void clear_afhi(struct afh_info *afhi);

diff --git a/afh_common.c b/afh_common.c
index 0d54eea132d8b91973e01971ab945411865ca2bc..5b6301b5f3d06405930df8fbcc64c7095f7ece06 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -33,6 +33,10 @@ void mp3_init(struct audio_format_handler *);
 #endif
 
 void wma_afh_init(struct audio_format_handler *);
+
+/** The list of all status items */
+const char *status_item_list[] = {STATUS_ITEM_ARRAY};
+
 /**
  * The list of supported audio formats.
  *
@@ -217,6 +221,26 @@ success:
        return ret;
 }
 
+/**
+ * Deallocate contents of a filled-in ahi structure
+ *
+ * \param afhi The structure to clear.
+ *
+ * The given pointer is kept, everything else is freed.
+ */
+void clear_afhi(struct afh_info *afhi)
+{
+       if (!afhi)
+               return;
+       free(afhi->chunk_table);
+       free(afhi->techinfo);
+       free(afhi->tags.artist);
+       free(afhi->tags.title);
+       free(afhi->tags.year);
+       free(afhi->tags.album);
+       free(afhi->tags.comment);
+}
+
 /**
  * Get the name of the given audio format.
  *

diff --git a/aft.c b/aft.c
index f89235a484287ce2b5f5aa9081c38fd7a7a5d712..7516e328e9bd63037476b99f37f4bbab5ffd0b37 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -1914,15 +1914,7 @@ out_free:
                send_ret = sc_send_va_buffer(&pad->cc->scc,
                        "failed to add %s (%s)\n", path, para_strerror(-ret));
        free(obj.data);
-       if (afhi_ptr) {
-               free(afhi_ptr->chunk_table);
-               free(afhi_ptr->techinfo);
-               free(afhi_ptr->tags.artist);
-               free(afhi_ptr->tags.title);
-               free(afhi_ptr->tags.year);
-               free(afhi_ptr->tags.album);
-               free(afhi_ptr->tags.comment);
-       }
+       clear_afhi(afhi_ptr);
        /* Stop adding files only on send errors. */
        return send_ret;
 }

diff --git a/buffer_tree.c b/buffer_tree.c
index 5b4ce19e5f774fd8aaf67fdc42592339f1fb81ac..7d79636fac717f4e4cb8559dec698f8204eed34c 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -761,7 +761,7 @@ void btr_remove_node(struct btr_node *btrn)
 
        if (!btrn)
                return;
-       PARA_NOTICE_LOG("removing btr node %s from buffer tree\n", btrn->name);
+       PARA_INFO_LOG("removing btr node %s from buffer tree\n", btrn->name);
        FOR_EACH_CHILD(ch, btrn)
                ch->parent = NULL;
        btr_drain(btrn);
@@ -825,6 +825,7 @@ void btr_splice_out_node(struct btr_node *btrn)
                        list_move(&ch->node, &btrn->parent->children);
        }
        assert(list_empty(&btrn->children));
+       btrn->parent = NULL;
 }
 
 /**
@@ -878,7 +879,7 @@ int btr_exec_up(struct btr_node *btrn, const char *command, char **value_result)
                if (ret < 0)
                        return ret;
                if (value_result && *value_result)
-                       PARA_NOTICE_LOG("%s(%s): %s\n", command, parent->name,
+                       PARA_INFO_LOG("%s(%s): %s\n", command, parent->name,
                                *value_result);
                return 1;
        }

diff --git a/client.c b/client.c
index 0ae015139fc915d5446cbb58b6eacf78d2d9eb2a..5f511708506a464e1a0e06f679eaa856ac015164 100644 (file)
--- a/client.c
+++ b/client.c
@@ -459,11 +459,6 @@ static int client_i9e_line_handler(char *line)
        return 1;
 }
 
-static void client_sighandler(int s)
-{
-       i9e_signal_dispatch(s);
-}
-
 static struct i9e_completer completers[] = {
        SERVER_COMPLETERS
        AFS_COMPLETERS
@@ -494,7 +489,7 @@ __noreturn static void interactive_session(void)
        }
        ici.history_file = history_file;
 
-       act.sa_handler = client_sighandler;
+       act.sa_handler = i9e_signal_dispatch;
        sigemptyset(&act.sa_mask);
        act.sa_flags = 0;
        sigaction(SIGINT, &act, NULL);

diff --git a/command.c b/command.c
index 4a464ebf88c56ab4ed0257e39ae5767709819811..f520e3ea0ac7ff3d210d0d9c30b0a510302dba46 100644 (file)
--- a/command.c
+++ b/command.c
@@ -43,8 +43,6 @@ extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 int send_afs_status(struct command_context *cc, int parser_friendly);
 
-const char *status_item_list[] = {STATUS_ITEM_ARRAY};
-
 static void dummy(__a_unused int s)
 {
 }

diff --git a/http_recv.c b/http_recv.c
index c3d918c51ab37069c05f879a2492b38d1ce6fd4d..b4bf1530d811fefb04c4f5b107e752e45d8e9048 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -141,7 +141,7 @@ static void http_recv_close(struct receiver_node *rn)
 
 static void *http_recv_parse_config(int argc, char **argv)
 {
-       struct http_recv_args_info *tmp = para_calloc(sizeof(struct http_recv_args_info));
+       struct http_recv_args_info *tmp = para_calloc(sizeof(*tmp));
 
        if (!http_recv_cmdline_parser(argc, argv, tmp))
                return tmp;

diff --git a/interactive.c b/interactive.c
index 6a29bffae5a68e783d4a4d788239b24455c4cb1e..f9ea3612ee8a1b0e80bef508051ed737b9a0ba05 100644 (file)
--- a/interactive.c
+++ b/interactive.c
@@ -334,7 +334,6 @@ static void i9e_pre_select(struct sched *s, __a_unused struct task *t)
                PARA_WARNING_LOG("set to nonblock failed: (fd0 %d, %s)\n",
                        i9ep->ici->fds[0], para_strerror(-ret));
        para_fd_set(i9ep->ici->fds[0], &s->rfds, &s->max_fileno);
-       return;
 }
 
 static void update_winsize(void)
@@ -376,12 +375,14 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
                return ret;
        i9ep->task.pre_select = i9e_pre_select;
        i9ep->task.post_select = i9e_post_select;
+       sprintf(i9ep->task.status, "i9e");
        register_task(s, &i9ep->task);
        rl_readline_name = "para_i9e";
        rl_basic_word_break_characters = " ";
        rl_attempted_completion_function = i9e_completer;
        i9ep->ici = ici;
        i9ep->stderr_stream = fdopen(ici->fds[2], "w");
+       setvbuf(i9ep->stderr_stream, NULL, _IONBF, 0);
 
        if (ici->history_file)
                read_history(ici->history_file);