--- vorbis-tools/ogg123/buffer.c

+++ vorbis-tools/ogg123/buffer.c

@@ -93,8 +93,6 @@ void buffer_thread_init (buf_t *buf)

 void buffer_thread_cleanup (void *arg)

 {

-  buf_t *buf = (buf_t *)arg;

-

   DEBUG("Enter buffer_thread_cleanup");

 }

--- vorbis-tools/ogg123/cmdline_options.c

+++ vorbis-tools/ogg123/cmdline_options.c

@@ -69,7 +69,7 @@ int parse_cmdline_options (int argc, char **argv,

   ao_option ** current_options = &temp_options;

   ao_info *info;

   int temp_driver_id = -1;

-  audio_device_t *current;

+  audio_device_t *current = NULL;

   int ret;

   while (-1 != (ret = getopt_long(argc, argv, "b:c::d:f:hl:k:K:o:p:qrRvVx:y:zZ@:",

--- vorbis-tools/ogg123/flac_format.c

+++ vorbis-tools/ogg123/flac_format.c

@@ -146,7 +146,6 @@ decoder_t* flac_init (data_source_t *source, ogg123_options_t *ogg123_opts,

 {

   decoder_t *decoder;

   flac_private_t *private;

-  FLAC__bool ret;

   /* Allocate data source structures */

@@ -485,9 +484,9 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder

   int samples = frame->header.blocksize;

   int channels = frame->header.channels;

-  int bits_per_sample = priv->bits_per_sample = frame->header.bits_per_sample;

   int i, j;

+  priv->bits_per_sample = frame->header.bits_per_sample;

   resize_buffer(priv, channels, samples);

   for (i = 0; i < channels; i++)

@@ -623,7 +622,7 @@ void print_flac_comments (FLAC__StreamMetadata_VorbisComment *f_comments,

       temp = realloc(temp, sizeof(char) * temp_len);

     }

-    strncpy(temp, f_comments->comments[i].entry, 

+    strncpy(temp, (const char *)f_comments->comments[i].entry,

 	    f_comments->comments[i].length);

     temp[f_comments->comments[i].length] = '\0';

--- vorbis-tools/ogg123/http_transport.c

+++ vorbis-tools/ogg123/http_transport.c

@@ -77,8 +77,11 @@ size_t write_callback (void *ptr, size_t size, size_t nmemb, void *arg)

   return size * nmemb;

 }

-int progress_callback (void *arg, size_t dltotal, size_t dlnow,

-		       size_t ultotal, size_t ulnow)

+int progress_callback (void *arg,

+		       double dltotal __attribute__ ((unused)),

+		       double dlnow __attribute__ ((unused)),

+		       double ultotal __attribute__ ((unused)),

+		       double ulnow __attribute__ ((unused)))

 {

   http_private_t *myarg = arg;

   print_statistics_arg_t *pstats_arg;

--- vorbis-tools/ogg123/ogg123.c

+++ vorbis-tools/ogg123/ogg123.c

@@ -706,7 +706,7 @@ void play (char *source_string)

 	if (nthc-- == 0) {

           if (audio_buffer) {

-            if (!buffer_submit_data(audio_buffer, convbuffer, ret)) {

+            if (!buffer_submit_data(audio_buffer, (char *)convbuffer, ret)) {

               status_error(_("ERROR: buffer write failed.\n"));

               eof = eos = 1;

               break;

--- vorbis-tools/ogg123/remote.c

+++ vorbis-tools/ogg123/remote.c

@@ -149,8 +149,8 @@ static void * remotethread(void * arg) {

     select (1, &fd, NULL, NULL, NULL);

 #endif

-    fgets(buf, MAXBUF, stdin);

-    buf[strlen(buf)-1] = 0;

+    if (fgets(buf, MAXBUF, stdin))

+      buf[strlen(buf)-1] = 0;

     /* Lock on */

     pthread_mutex_lock (&main_lock);

--- vorbis-tools/ogg123/speex_format.c

+++ vorbis-tools/ogg123/speex_format.c

@@ -281,8 +281,6 @@ int speex_read (decoder_t *decoder, void *ptr, int nbytes, int *eos,

 int speex_seek (decoder_t *decoder, double offset, int whence)

 {

-  speex_private_t *priv = decoder->private;

-

     return 0;

 }

@@ -293,7 +291,6 @@ decoder_stats_t *speex_statistics (decoder_t *decoder)

 {

   speex_private_t *priv = decoder->private;

   long instant_bitrate;

-  long avg_bitrate;

   priv->stats.total_time = (double) priv->totalsamples /

     (double) decoder->actual_fmt.rate;

@@ -465,7 +462,7 @@ void *process_header(ogg_packet *op, int *frame_size,

 		     void *callback_arg)

 {

    void *st;

-   SpeexMode *mode;

+   const SpeexMode *mode;

    int modeID;

    SpeexCallback callback;

    int enhance = ENHANCE_AUDIO;

--- vorbis-tools/ogg123/status.c

+++ vorbis-tools/ogg123/status.c

@@ -148,7 +148,7 @@ int print_statistics_line (stat_format_t stats[])

     switch (stats->type) {

     case stat_noarg:

-      len += sprintf(str+len, stats->formatstr);

+      len += sprintf(str+len, "%s", stats->formatstr);

       break;

     case stat_intarg:

       len += sprintf(str+len, stats->formatstr, stats->arg.intarg);

--- vorbis-tools/oggenc/flac.c

+++ vorbis-tools/oggenc/flac.c

@@ -317,8 +317,6 @@ void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__Strea

 void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)

 #endif

 {

-    flacfile *flac = (flacfile *) client_data;

-

 }

 #if !NEED_EASYFLAC

@@ -370,7 +368,8 @@ void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComme

     {

         char *comment = malloc(f_comments->comments[i].length + 1);

         memset(comment, '\0', f_comments->comments[i].length + 1);

-        strncpy(comment, f_comments->comments[i].entry, f_comments->comments[i].length);

+        strncpy(comment, (const char *)f_comments->comments[i].entry,

+          f_comments->comments[i].length);

         vorbis_comment_add(v_comments, comment);

         free(comment);

     }