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 --combined NEWS
index 9a84c332001ddc5d0cdf4fbf769550b4c9387790,fa8e0249be9945f08cd4bf9c36531854cf8000f5..7fcf7f974a402907019cd0f0805a666cee3b603c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -6,11 -6,7 +6,12 @@@
          support this feature, data is sent as a multiplexed stream.
        - The --no_default_filters option of para_filter has been
          removed.
 +      - Several fixes and latency improvements to various decoders.
 +      - The alsa writer now limits the prebuffer time to 500ms.
        - 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 --combined alsa_write.c
index f50ad6a36e71a4f66a2747a6e7c4d08a4950089b,528463de574eaf1fcbc7780461d0de5dbed01a12..8c12c728e551035bd8eca071216e3c7e44060de5
--- 1/alsa_write.c
--- 2/alsa_write.c
+++ b/alsa_write.c
@@@ -72,7 -72,7 +72,7 @@@ static int alsa_init(struct private_als
        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;
@@@ -113,8 -113,6 +113,8 @@@
                NULL);
        if (ret < 0 || buffer_time == 0)
                goto fail;
 +      /* buffer at most 500 milliseconds */
 +      buffer_time = PARA_MIN(buffer_time, 500U * 1000U);
        msg = "could not set buffer time";
        ret = snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams,
                &buffer_time, NULL);
@@@ -163,12 -161,12 +163,12 @@@
        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 -175,7 +177,7 @@@
                        PARA_INFO_LOG("%s\n", buf);
                        buf = p + 1;
                }
-               snd_output_close(log);
+               snd_output_close(output_log);
        }
        return 1;
  fail:
@@@ -358,6 -356,7 +358,6 @@@ void alsa_write_init(struct writer *w
        w->pre_select = alsa_write_pre_select;
        w->post_select = alsa_write_post_select;
        w->parse_config_or_die = alsa_parse_config_or_die;
 -      w->shutdown = NULL; /* nothing to do */
        w->free_config = alsa_free_config;
        w->help = (struct ggo_help) {
                .short_help = alsa_write_args_info_help,