fix "unused variables" warnings and others

diff --git a/src/plugin_xmms/charset.c b/src/plugin_xmms/charset.c
index d5b3e5a..8a8091e 100644 (file)
--- a/src/plugin_xmms/charset.c
+++ b/src/plugin_xmms/charset.c
@@ -214,6 +214,7 @@ static char* convert_string (const char *string, char *from, char *to)
 #else
 static char* convert_string (const char *string, char *from, char *to)
 {
+       (void)from, (void)to;
     if (!string)
         return NULL;
     return g_strdup(string);
@@ -301,6 +302,7 @@ gboolean test_conversion_charset (char *from, char *to)
 #else
 gboolean test_conversion_charset (char *from, char *to)
 {
+       (void)from, (void)to;
     return TRUE;
 }
 #endif

diff --git a/src/plugin_xmms/configure.c b/src/plugin_xmms/configure.c
index 83c9ec3..7c22910 100644 (file)
--- a/src/plugin_xmms/configure.c
+++ b/src/plugin_xmms/configure.c
@@ -66,6 +66,7 @@ static void flac_configurewin_ok(GtkWidget * widget, gpointer data)
        ConfigFile *cfg;
        gchar *filename;
 
+       (void)widget, (void)data; /* unused arguments */
        g_free(flac_cfg.tag_format);
         flac_cfg.tag_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(title_tag_entry)));        
        flac_cfg.file_char_set = Charset_Get_Name_From_Title(gtk_entry_get_text_1(fileCharacterSetEntry));
@@ -86,12 +87,14 @@ static void flac_configurewin_ok(GtkWidget * widget, gpointer data)
        gtk_widget_destroy(flac_configurewin);
 }
 
-static void configure_destroy(GtkWidget * w, gpointer data)
+static void configure_destroy(GtkWidget *widget, gpointer data)
 {
+       (void)widget, (void)data; /* unused arguments */
 }
 
-static void title_tag_override_cb(GtkWidget * w, gpointer data)
+static void title_tag_override_cb(GtkWidget *widget, gpointer data)
 {
+       (void)widget, (void)data; /* unused arguments */
        flac_cfg.tag_override = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(title_tag_override));
 
        gtk_widget_set_sensitive(title_tag_box, flac_cfg.tag_override);
@@ -99,8 +102,9 @@ static void title_tag_override_cb(GtkWidget * w, gpointer data)
 
 }
 
-static void convert_char_set_cb(GtkWidget * w, gpointer data)
+static void convert_char_set_cb(GtkWidget *widget, gpointer data)
 {
+       (void)widget, (void)data; /* unused arguments */
        flac_cfg.convert_char_set = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(convert_char_set));
 
        gtk_widget_set_sensitive(fileCharacterSetEntry, flac_cfg.convert_char_set);

diff --git a/src/share/charset.c b/src/share/charset.c
index 29b214a..2775d10 100644 (file)
--- a/src/share/charset.c
+++ b/src/share/charset.c
@@ -107,7 +107,7 @@ int utf8_mbtowc(int *pwc, const char *s, size_t n)
   else
     return -1;
 
-  if (n < k)
+  if (n < (size_t)k)
     return -1;
   wc = *s++ & ((1 << (7 - k)) - 1);
   for (i = 1; i < k; i++) {
@@ -128,29 +128,29 @@ int utf8_wctomb(char *s, int wc1)
 
   if (!s)
     return 0;
-  if (wc < (1 << 7)) {
+  if (wc < (1u << 7)) {
     *s++ = wc;
     return 1;
   }
-  else if (wc < (1 << 11)) {
+  else if (wc < (1u << 11)) {
     *s++ = 0xc0 | (wc >> 6);
     *s++ = 0x80 | (wc & 0x3f);
     return 2;
   }
-  else if (wc < (1 << 16)) {
+  else if (wc < (1u << 16)) {
     *s++ = 0xe0 | (wc >> 12);
     *s++ = 0x80 | ((wc >> 6) & 0x3f);
     *s++ = 0x80 | (wc & 0x3f);
     return 3;
   }
-  else if (wc < (1 << 21)) {
+  else if (wc < (1u << 21)) {
     *s++ = 0xf0 | (wc >> 18);
     *s++ = 0x80 | ((wc >> 12) & 0x3f);
     *s++ = 0x80 | ((wc >> 6) & 0x3f);
     *s++ = 0x80 | (wc & 0x3f);
     return 4;
   }
-  else if (wc < (1 << 26)) {
+  else if (wc < (1u << 26)) {
     *s++ = 0xf8 | (wc >> 24);
     *s++ = 0x80 | ((wc >> 18) & 0x3f);
     *s++ = 0x80 | ((wc >> 12) & 0x3f);
@@ -158,7 +158,7 @@ int utf8_wctomb(char *s, int wc1)
     *s++ = 0x80 | (wc & 0x3f);
     return 5;
   }
-  else if (wc < (1 << 31)) {
+  else if (wc < (1u << 31)) {
     *s++ = 0xfc | (wc >> 30);
     *s++ = 0x80 | ((wc >> 24) & 0x3f);
     *s++ = 0x80 | ((wc >> 18) & 0x3f);
@@ -203,11 +203,13 @@ int charset_max(struct charset *charset)
 
 static int mbtowc_utf8(void *map, int *pwc, const char *s, size_t n)
 {
+  (void)map;
   return utf8_mbtowc(pwc, s, n);
 }
 
 static int wctomb_utf8(void *map, char *s, int wc)
 {
+  (void)map;
   return utf8_wctomb(s, wc);
 }
 
@@ -221,6 +223,7 @@ static int mbtowc_ascii(void *map, int *pwc, const char *s, size_t n)
 {
   int wc;
 
+  (void)map;
   if (!n || !s)
     return 0;
   wc = (unsigned char)*s;
@@ -233,6 +236,7 @@ static int mbtowc_ascii(void *map, int *pwc, const char *s, size_t n)
 
 static int wctomb_ascii(void *map, char *s, int wc)
 {
+  (void)map;
   if (!s)
     return 0;
   if (wc & ~0x7f)
@@ -251,6 +255,7 @@ static int mbtowc_iso1(void *map, int *pwc, const char *s, size_t n)
 {
   int wc;
 
+  (void)map;
   if (!n || !s)
     return 0;
   wc = (unsigned char)*s;
@@ -263,6 +268,7 @@ static int mbtowc_iso1(void *map, int *pwc, const char *s, size_t n)
 
 static int wctomb_iso1(void *map, char *s, int wc)
 {
+  (void)map;
   if (!s)
     return 0;
   if (wc & ~0xff)

diff --git a/src/share/getopt.c b/src/share/getopt.c
index 81104ea..86d362d 100644 (file)
--- a/src/share/getopt.c
+++ b/src/share/getopt.c
@@ -459,6 +459,8 @@ FLAC__share___getopt_initialize (argc, argv, optstring)
     }
   else
     nonoption_flags_len = 0;
+#else
+  (void)argc, (void)argv;
 #endif
 
   return optstring;