GNOME.org
 

[easytag] Fix format warnings caused by incorrect sign

commit 69f6bb575c0368bbe658d03b43533cbf7577ee6e
Author: David King <amigadave amigadave com>
Date:   Sat Feb 7 21:27:46 2015 +0000

    Fix format warnings caused by incorrect sign
    
    GCC 5.0 now warns about using %d as a format specifier for an unsigned
    int.

 src/application.c              |    2 +-
 src/cddb_dialog.c              |   37 +++++++++++++++++++++++--------------
 src/easytag.c                  |    9 +++++----
 src/file.c                     |    6 +++---
 src/file_area.c                |    2 +-
 src/file_list.c                |    4 ++--
 src/misc.c                     |   27 +++++++++++++++++----------
 src/tag_area.c                 |    4 ++--
 src/tags/libapetag/apetaglib.c |    4 ++--
 9 files changed, 56 insertions(+), 39 deletions(-)
---
diff --git a/src/application.c b/src/application.c
index 05bf14c..30ed234 100644
--- a/src/application.c
+++ b/src/application.c
@@ -320,7 +320,7 @@ et_application_local_command_line (GApplication *application,
     n_args = g_strv_length (argv);
     *exit_status = 0;
 
-    g_debug ("Received %d commandline arguments", n_args);
+    g_debug ("Received %u commandline arguments", n_args);
 
     if (n_args <= 1)
     {
diff --git a/src/cddb_dialog.c b/src/cddb_dialog.c
index 01d6313..30c3e5c 100644
--- a/src/cddb_dialog.c
+++ b/src/cddb_dialog.c
@@ -901,7 +901,7 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
                    cddb_in = g_strdup_printf("GET %s%s/gnudb/"
                                              "%s/%s"
                                              " HTTP/1.1\r\n"
-                                             "Host: %s:%d\r\n"
+                                             "Host: %s:%u\r\n"
                                              "User-Agent: %s %s\r\n"
                                              "%s"
                                              "Connection: close\r\n"
@@ -922,7 +922,7 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
                                              "%s+%s"
                                              "&hello=noname+localhost+%s+%s"
                                              "&proto=6 HTTP/1.1\r\n"
-                                             "Host: %s:%d\r\n"
+                                             "Host: %s:%u\r\n"
                                              "%s"
                                              "Connection: close\r\n\r\n",
                                              proxy_enabled ? "http://"; : "",
@@ -1563,7 +1563,7 @@ Cddb_Search_Album_List_From_String_Freedb (EtCDDBDialog *self)
                               "%s"
                               "&grouping=none"
                               " HTTP/1.1\r\n"
-                              "Host: %s:%d\r\n"
+                              "Host: %s:%u\r\n"
                               "User-Agent: %s %s\r\n"
                               "%s"
                               "Connection: close\r\n"
@@ -1783,7 +1783,13 @@ Cddb_Search_Album_List_From_String_Freedb (EtCDDBDialog *self)
     if (web_search_disabled)
         msg = g_strdup_printf(_("Sorry, the web-based search is currently not available"));
     else
-        msg = g_strdup_printf(ngettext("Found one matching album","Found %d matching 
albums",g_list_length(priv->album_list)),g_list_length(priv->album_list));
+    {
+        msg = g_strdup_printf (ngettext ("Found one matching album",
+                                         "Found %u matching albums",
+                                         g_list_length (priv->album_list)),
+                               g_list_length (priv->album_list));
+    }
+
     gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
     g_free(msg);
 
@@ -1903,7 +1909,7 @@ Cddb_Search_Album_List_From_String_Gnudb (EtCDDBDialog *self)
                                   "%s"
                                   "?page=%d"
                                   " HTTP/1.1\r\n"
-                                  "Host: %s:%d\r\n"
+                                  "Host: %s:%u\r\n"
                                   "User-Agent: %s %s\r\n"
                                   "%s"
                                   "Connection: close\r\n"
@@ -3330,7 +3336,10 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
         return FALSE;
     }else
     {
-        msg = g_strdup_printf(ngettext("One file selected","%d files 
selected",file_selectedcount),file_selectedcount);
+        msg = g_strdup_printf (ngettext ("One file selected",
+                                         "%u files selected",
+                                         file_selectedcount),
+                               file_selectedcount);
         gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
         g_free(msg);
     }
@@ -3353,11 +3362,11 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
 
         if (query_string->len > 0)
         {
-            g_string_append_printf (query_string, "+%d", total_frames);
+            g_string_append_printf (query_string, "+%u", total_frames);
         }
         else
         {
-            g_string_append_printf (query_string, "%d", total_frames);
+            g_string_append_printf (query_string, "%u", total_frames);
         }
 
         secs = etfile->ETFileInfo->duration;
@@ -3455,11 +3464,11 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
             // proto=1 => ISO-8859-1 - proto=6 => UTF-8
             cddb_in = g_strdup_printf("GET %s%s%s?cmd=cddb+query+"
                                       "%s+"
-                                      "%d+%s+"
-                                      "%d"
+                                      "%u+%s+"
+                                      "%u"
                                       "&hello=noname+localhost+%s+%s"
                                       "&proto=6 HTTP/1.1\r\n"
-                                      "Host: %s:%d\r\n"
+                                      "Host: %s:%u\r\n"
                                       "%s"
                                       "Connection: close\r\n\r\n",
                                       proxy_enabled ? "http://"; : "",
@@ -3475,8 +3484,8 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
             g_free (proxy_auth);
             //g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
 
-            msg = g_strdup_printf(_("Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"),
-                                cddb_discid,num_tracks,disc_length);
+            msg = g_strdup_printf (_("Sending request (disc ID: %s, #tracks: %u, Disc length: %u)…"),
+                                   cddb_discid, num_tracks, disc_length);
             gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
             g_free(msg);
 
@@ -3644,7 +3653,7 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
     g_string_free (query_string, TRUE);
 
     msg = g_strdup_printf (ngettext ("DiscID ‘%s’ gave one matching album",
-                                     "DiscID ‘%s’ gave %d matching albums",
+                                     "DiscID ‘%s’ gave %u matching albums",
                                      g_list_length (priv->album_list)),
                            cddb_discid, g_list_length (priv->album_list));
     gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
diff --git a/src/easytag.c b/src/easytag.c
index 4d7b620..f22b661 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -997,7 +997,7 @@ Read_Directory (const gchar *path_real)
     nbrfile = g_list_length(FileList);
 
     et_application_window_progress_set_fraction (window, 0.0);
-    g_snprintf(progress_bar_text, 30, "%d/%d", 0, nbrfile);
+    g_snprintf (progress_bar_text, 30, "%d/%u", 0, nbrfile);
     et_application_window_progress_set_text (window, progress_bar_text);
 
     // Load the supported files (Extension recognized)
@@ -1020,7 +1020,8 @@ Read_Directory (const gchar *path_real)
         /* Update the progress bar. */
         fraction = (++progress_bar_index) / (double) nbrfile;
         et_application_window_progress_set_fraction (window, fraction);
-        g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nbrfile);
+        g_snprintf (progress_bar_text, 30, "%d/%u", progress_bar_index,
+                    nbrfile);
         et_application_window_progress_set_text (window, progress_bar_text);
         while (gtk_events_pending())
             gtk_main_iteration();
@@ -1057,14 +1058,14 @@ Read_Directory (const gchar *path_real)
         if (g_settings_get_boolean (MainSettings, "browse-subdir"))
         {
             msg = g_strdup_printf (ngettext ("Found one file in this directory and subdirectories",
-                                             "Found %d files in this directory and subdirectories",
+                                             "Found %u files in this directory and subdirectories",
                                              ETCore->ETFileDisplayedList_Length),
                                    ETCore->ETFileDisplayedList_Length);
         }
         else
         {
             msg = g_strdup_printf (ngettext ("Found one file in this directory",
-                                             "Found %d files in this directory",
+                                             "Found %u files in this directory",
                                              ETCore->ETFileDisplayedList_Length),
                                    ETCore->ETFileDisplayedList_Length);
         }
diff --git a/src/file.c b/src/file.c
index 7f41258..299041d 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1300,7 +1300,7 @@ ET_Display_File_Data_To_UI (ET_File *ETFile)
             et_file_header_fields_free (fields);
             Log_Print (LOG_ERROR,
                        "ETFileInfo: Undefined file type %d for file %s.",
-                       description->FileType, cur_filename_utf8);
+                       (gint)description->FileType, cur_filename_utf8);
             break;
     }
 
@@ -1450,7 +1450,7 @@ void ET_Save_File_Data_From_UI (ET_File *ETFile)
             FileTag = et_file_tag_new ();
             Log_Print (LOG_ERROR,
                        "FileTag: Undefined tag type %d for file %s.",
-                       description->TagType, cur_filename_utf8);
+                       (gint)description->TagType, cur_filename_utf8);
             break;
     }
 
@@ -1892,7 +1892,7 @@ ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error)
         default:
             Log_Print (LOG_ERROR,
                        "Saving to HD: Undefined function for tag type '%d' (file %s).",
-                       description->TagType, cur_filename_utf8);
+                       (gint)description->TagType, cur_filename_utf8);
             state = FALSE;
             break;
     }
diff --git a/src/file_area.c b/src/file_area.c
index 30eb8f9..be9849a 100644
--- a/src/file_area.c
+++ b/src/file_area.c
@@ -356,7 +356,7 @@ et_file_area_set_file_fields (EtFileArea *self,
     g_free (basename_utf8);
 
     /* Show position of current file in list */
-    text = g_strdup_printf ("%d/%d:", ETFile->IndexKey,
+    text = g_strdup_printf ("%u/%u:", ETFile->IndexKey,
                             ETCore->ETFileDisplayedList_Length);
     gtk_label_set_text (GTK_LABEL (priv->index_label), text);
     g_object_unref (file);
diff --git a/src/file_list.c b/src/file_list.c
index d35c21e..a50a46a 100644
--- a/src/file_list.c
+++ b/src/file_list.c
@@ -322,7 +322,7 @@ et_file_list_add (GList *file_list,
             /* FIXME: Translatable string. */
             Log_Print (LOG_ERROR,
                        "FileTag: Undefined tag type (%d) for file %s",
-                       description->TagType, filename_utf8);
+                       (gint)description->TagType, filename_utf8);
             break;
     }
 
@@ -388,7 +388,7 @@ et_file_list_add (GList *file_list,
             /* FIXME: Translatable string. */
             Log_Print (LOG_ERROR,
                        "ETFileInfo: Undefined file type (%d) for file %s",
-                       description->FileType, filename_utf8);
+                       (gint)description->FileType, filename_utf8);
             /* To get at least the file size. */
             success = et_core_read_file_info (file, ETFileInfo, &error);
             break;
diff --git a/src/misc.c b/src/misc.c
index cc5d519..fd2d2e5 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -324,16 +324,22 @@ gchar *Convert_Duration (gulong duration)
     gchar *data = NULL;
 
     if (duration == 0)
-        return g_strdup_printf("%d:%.2d",minute,second);
+    {
+        return g_strdup_printf ("%u:%.2u", minute, second);
+    }
 
     hour   = duration/3600;
     minute = (duration%3600)/60;
     second = (duration%3600)%60;
 
     if (hour)
-        data = g_strdup_printf("%d:%.2d:%.2d",hour,minute,second);
+    {
+        data = g_strdup_printf ("%u:%.2u:%.2u", hour, minute, second);
+    }
     else
-        data = g_strdup_printf("%d:%.2d",minute,second);
+    {
+        data = g_strdup_printf ("%u:%.2u", minute, second);
+    }
 
     return data;
 }
@@ -343,13 +349,13 @@ et_disc_number_to_string (const guint disc_number)
 {
     if (g_settings_get_boolean (MainSettings, "tag-disc-padded"))
     {
-        return g_strdup_printf ("%.*d",
-                                g_settings_get_uint (MainSettings,
-                                                     "tag-disc-length"),
+        return g_strdup_printf ("%.*u",
+                                (gint)g_settings_get_uint (MainSettings,
+                                                           "tag-disc-length"),
                                 disc_number);
     }
 
-    return g_strdup_printf ("%d", disc_number);
+    return g_strdup_printf ("%u", disc_number);
 }
 
 gchar *
@@ -357,12 +363,13 @@ et_track_number_to_string (const guint track_number)
 {
     if (g_settings_get_boolean (MainSettings, "tag-number-padded"))
     {
-        return g_strdup_printf ("%.*d", g_settings_get_uint (MainSettings,
-                                                             "tag-number-length"),
+        return g_strdup_printf ("%.*u",
+                                (gint)g_settings_get_uint (MainSettings,
+                                                           "tag-number-length"),
                                 track_number);
     }
     else
     {
-        return g_strdup_printf ("%d", track_number);
+        return g_strdup_printf ("%u", track_number);
     }
 }
diff --git a/src/tag_area.c b/src/tag_area.c
index 5fa6526..45d480b 100644
--- a/src/tag_area.c
+++ b/src/tag_area.c
@@ -3018,7 +3018,7 @@ et_tag_area_display_et_file (EtTagArea *self,
             /* FIXME: Translatable string. */
             Log_Print (LOG_ERROR,
                        "FileTag: Undefined tag type %d for file %s.",
-                       ETFile->ETFileDescription->TagType,
+                       (gint)ETFile->ETFileDescription->TagType,
                        ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8);
             break;
     }
@@ -3249,7 +3249,7 @@ et_tag_area_display_et_file (EtTagArea *self,
 
         /* Get page "Images" of the notebook. */
         page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), 1);
-        string = g_strdup_printf (_("Images (%d)"), nbr_pic);
+        string = g_strdup_printf (_("Images (%u)"), nbr_pic);
         /* Update the notebook tab. */
         gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (priv->notebook), page,
                                          string);
diff --git a/src/tags/libapetag/apetaglib.c b/src/tags/libapetag/apetaglib.c
index 2f407e0..d021efc 100644
--- a/src/tags/libapetag/apetaglib.c
+++ b/src/tags/libapetag/apetaglib.c
@@ -515,12 +515,12 @@ libapetag_print_mem_cnt (apetag *mem_cnt)
     for (n = 0; (mem_cnt->countTag) > n; n++) {
         if ( (mTag[n]->flags & ~ITEM_TEXT) == 0 ||
             (mTag[n]->flags & ~ITEM_LINK) == 0 ) {
-        printf (">apetaglib>PRINT>>F=%li SN=%li SV=%li N[%s] V[%s]\n", 
+        printf (">apetaglib>PRINT>>F=%lu SN=%li SV=%li N[%s] V[%s]\n",
             mTag[n]->flags,
             (long) mTag[n]->sizeName, (long) mTag[n]->sizeValue, 
             mTag[n]->name, mTag[n]->value);
         } else {
-        printf (">apetaglib>PRINT>>F=%li SN=%li SV=%li N[%s] V=BINARY\n",
+        printf (">apetaglib>PRINT>>F=%lu SN=%li SV=%li N[%s] V=BINARY\n",
             mTag[n]->flags,
             (long) mTag[n]->sizeName, (long) mTag[n]->sizeValue, 
             mTag[n]->name);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]