Merge branch 't/old_gcc_fixes'

	82d304 buffer_tree.h: Fix gcc warning.
	5535f6 alsa: Fix gcc warning.

Simple enough and well tested with no regressions found.

diff --git a/NEWS b/NEWS
index 9a84c332001ddc5d0cdf4fbf769550b4c9387790..7fcf7f974a402907019cd0f0805a666cee3b603c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@
        - Documentation improvements.
        - Overhaul of the command_util.sh script.
        - Fixes for some minor problems found by the clang analyzer.
+       - Compiles (almost) without warnings on gcc-3.
 
 ------------------------------------------
 0.4.10 (2012-03-30) "heterogeneous vacuum"

diff --git a/alsa_write.c b/alsa_write.c
index f50ad6a36e71a4f66a2747a6e7c4d08a4950089b..8c12c728e551035bd8eca071216e3c7e44060de5 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -72,7 +72,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
        snd_pcm_sw_params_t *swparams;
        snd_pcm_uframes_t start_threshold, stop_threshold;
        snd_pcm_uframes_t buffer_size, period_size;
-       snd_output_t *log;
+       snd_output_t *output_log;
        unsigned buffer_time;
        int ret;
        const char *msg;
@@ -163,12 +163,12 @@ static int alsa_init(struct private_alsa_write_data *pad,
        ret = snd_pcm_nonblock(pad->handle, 1);
        if (ret < 0)
                goto fail;
-       ret = snd_output_buffer_open(&log);
+       ret = snd_output_buffer_open(&output_log);
        if (ret == 0) {
                char *buf;
                PARA_INFO_LOG("dumping alsa configuration\n");
-               snd_pcm_dump(pad->handle, log);
-               snd_output_buffer_string(log, &buf);
+               snd_pcm_dump(pad->handle, output_log);
+               snd_output_buffer_string(output_log, &buf);
                for (;;) {
                        char *p = strchr(buf, '\n');
                        if (!p) /* omit last output line, it's empty */
@@ -177,7 +177,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
                        PARA_INFO_LOG("%s\n", buf);
                        buf = p + 1;
                }
-               snd_output_close(log);
+               snd_output_close(output_log);
        }
        return 1;
 fail:

diff --git a/buffer_tree.h b/buffer_tree.h
index 4d27ec7b8b1a49db01aa4a87fe94b6a7fff0e96c..a9890b9854b5bce2fce731a19d6cc44ba538c442 100644 (file)
--- a/buffer_tree.h
+++ b/buffer_tree.h
@@ -196,7 +196,7 @@ void btr_splice_out_node(struct btr_node *btrn);
 void btr_pushdown(struct btr_node *btrn);
 void *btr_context(struct btr_node *btrn);
 void btr_merge(struct btr_node *btrn, size_t dest_size);
-void btr_log_tree(struct btr_node *btrn, int loglevel);
+void btr_log_tree(struct btr_node *btrn, int ll);
 void btr_pushdown_one(struct btr_node *btrn);
 bool btr_inplace_ok(struct btr_node *btrn);
 int btr_node_status(struct btr_node *btrn, size_t min_iqs,