GNOME.org
 

[easytag] Remove unused filename parameters in header code

commit 357e5d2296d49eea058e635a6320ffa10d89e4a2
Author: David King <amigadave amigadave com>
Date:   Sat Oct 25 20:51:28 2014 +0100

    Remove unused filename parameters in header code
    
    Avoid some -Wextra warnings about unused parameters.

 src/et_core.c                 |   29 +++++++++--------------------
 src/tags/flac_header.c        |    3 +--
 src/tags/flac_header.h        |    2 +-
 src/tags/monkeyaudio_header.c |    3 +--
 src/tags/monkeyaudio_header.h |    2 +-
 src/tags/mp4_header.cc        |    5 ++---
 src/tags/mp4_header.h         |    2 +-
 src/tags/mpeg_header.c        |    3 +--
 src/tags/mpeg_header.h        |    2 +-
 src/tags/musepack_header.c    |    5 ++---
 src/tags/musepack_header.h    |    4 ++--
 src/tags/ogg_header.c         |    3 +--
 src/tags/ogg_header.h         |    2 +-
 src/tags/opus_header.c        |    3 +--
 src/tags/opus_header.h        |    2 +-
 src/tags/wavpack_header.c     |    3 +--
 src/tags/wavpack_header.h     |    2 +-
 17 files changed, 28 insertions(+), 47 deletions(-)
---
diff --git a/src/et_core.c b/src/et_core.c
index 89d76c6..93224c3 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -2875,19 +2875,14 @@ ET_Display_File_Data_To_UI (ET_File *ETFile)
 {
     EtApplicationWindow *window;
     const ET_File_Description *ETFileDescription;
-    const gchar *cur_filename;
     const gchar *cur_filename_utf8;
     gchar *msg;
     EtFileHeaderFields *fields;
-#ifdef ENABLE_OPUS
-    GFile *file;
-#endif
 
     g_return_if_fail (ETFile != NULL &&
                       ((GList *)ETFile->FileNameCur)->data != NULL);
                       /* For the case where ETFile is an "empty" structure. */
 
-    cur_filename      = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value;
     cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
     ETFileDescription = ETFile->ETFileDescription;
 
@@ -2914,67 +2909,61 @@ ET_Display_File_Data_To_UI (ET_File *ETFile)
 #if defined ENABLE_MP3 && defined ENABLE_ID3LIB
         case MP3_FILE:
         case MP2_FILE:
-            fields = Mpeg_Header_Display_File_Info_To_UI (cur_filename,
-                                                          ETFile);
+            fields = et_mpeg_header_display_file_info_to_ui (ETFile);
             et_application_window_file_area_set_header_fields (window, fields);
             et_mpeg_file_header_fields_free (fields);
             break;
 #endif
 #ifdef ENABLE_OGG
         case OGG_FILE:
-            fields = Ogg_Header_Display_File_Info_To_UI (cur_filename, ETFile);
+            fields = et_ogg_header_display_file_info_to_ui (ETFile);
             et_application_window_file_area_set_header_fields (window, fields);
             et_ogg_file_header_fields_free (fields);
             break;
 #endif
 #ifdef ENABLE_SPEEX
         case SPEEX_FILE:
-            fields = Ogg_Header_Display_File_Info_To_UI (cur_filename, ETFile);
+            fields = et_ogg_header_display_file_info_to_ui (ETFile);
             et_application_window_file_area_set_header_fields (window, fields);
             et_ogg_file_header_fields_free (fields);
             break;
 #endif
 #ifdef ENABLE_FLAC
         case FLAC_FILE:
-            fields = Flac_Header_Display_File_Info_To_UI (cur_filename,
-                                                          ETFile);
+            fields = et_flac_header_display_file_info_to_ui (ETFile);
             et_application_window_file_area_set_header_fields (window, fields);
             et_flac_file_header_fields_free (fields);
             break;
 #endif
         case MPC_FILE:
-            fields = Mpc_Header_Display_File_Info_To_UI (cur_filename, ETFile);
+            fields = et_mpc_header_display_file_info_to_ui (ETFile);
             et_application_window_file_area_set_header_fields (window, fields);
             et_mpc_file_header_fields_free (fields);
             break;
         case MAC_FILE:
-            fields = Mac_Header_Display_File_Info_To_UI (cur_filename,
-                                                         ETFile);
+            fields = et_mac_header_display_file_info_to_ui (ETFile);
             et_application_window_file_area_set_header_fields (window, fields);
             et_mac_file_header_fields_free (fields);
             break;
 #ifdef ENABLE_MP4
         case MP4_FILE:
-            fields = Mp4_Header_Display_File_Info_To_UI (cur_filename, ETFile);
+            fields = et_mp4_header_display_file_info_to_ui (ETFile);
             et_application_window_file_area_set_header_fields (window, fields);
             et_mp4_file_header_fields_free (fields);
             break;
 #endif
 #ifdef ENABLE_WAVPACK
         case WAVPACK_FILE:
-            fields = Wavpack_Header_Display_File_Info_To_UI (cur_filename,
-                                                             ETFile);
+            fields = et_wavpack_header_display_file_info_to_ui (ETFile);
             et_application_window_file_area_set_header_fields (window, fields);
             et_wavpack_file_header_fields_free (fields);
             break;
 #endif
 #ifdef ENABLE_OPUS
         case OPUS_FILE:
-            file = g_file_new_for_path (cur_filename);
-            fields = et_opus_header_display_file_info_to_ui (file, ETFile);
+            fields = et_opus_header_display_file_info_to_ui (ETFile);
             et_application_window_file_area_set_header_fields (window, fields);
             et_opus_file_header_fields_free (fields);
-            g_object_unref (file);
             break;
 #endif
         case UNKNOWN_FILE:
diff --git a/src/tags/flac_header.c b/src/tags/flac_header.c
index b388891..7a1a9c7 100644
--- a/src/tags/flac_header.c
+++ b/src/tags/flac_header.c
@@ -293,8 +293,7 @@ flac_header_read_file_info (GFile *file,
 }
 
 EtFileHeaderFields *
-Flac_Header_Display_File_Info_To_UI (const gchar *filename_utf8,
-                                     const ET_File *ETFile)
+et_flac_header_display_file_info_to_ui (const ET_File *ETFile)
 {
     EtFileHeaderFields *fields;
     ET_File_Info *info;
diff --git a/src/tags/flac_header.h b/src/tags/flac_header.h
index 3be361c..2dce50c 100644
--- a/src/tags/flac_header.h
+++ b/src/tags/flac_header.h
@@ -25,7 +25,7 @@
 G_BEGIN_DECLS
 
 gboolean flac_header_read_file_info (GFile* file, ET_File_Info *ETFileInfo, GError **error);
-EtFileHeaderFields * Flac_Header_Display_File_Info_To_UI (const gchar *filename, const ET_File *ETFile);
+EtFileHeaderFields * et_flac_header_display_file_info_to_ui (const ET_File *ETFile);
 void et_flac_file_header_fields_free (EtFileHeaderFields *fields);
 
 G_END_DECLS
diff --git a/src/tags/monkeyaudio_header.c b/src/tags/monkeyaudio_header.c
index 7bb2b50..0cfb5fe 100644
--- a/src/tags/monkeyaudio_header.c
+++ b/src/tags/monkeyaudio_header.c
@@ -70,8 +70,7 @@ mac_header_read_file_info (const gchar *filename,
 }
 
 EtFileHeaderFields *
-Mac_Header_Display_File_Info_To_UI (const gchar *filename_utf8,
-                                    const ET_File *ETFile)
+et_mac_header_display_file_info_to_ui (const ET_File *ETFile)
 {
     EtFileHeaderFields *fields;
     ET_File_Info *info;
diff --git a/src/tags/monkeyaudio_header.h b/src/tags/monkeyaudio_header.h
index 2755a08..b14b75b 100644
--- a/src/tags/monkeyaudio_header.h
+++ b/src/tags/monkeyaudio_header.h
@@ -26,7 +26,7 @@
 G_BEGIN_DECLS
 
 gboolean mac_header_read_file_info (const gchar *filename, ET_File_Info *ETFileInfo, GError **error);
-EtFileHeaderFields * Mac_Header_Display_File_Info_To_UI (const gchar *filename, const ET_File *ETFile);
+EtFileHeaderFields * et_mac_header_display_file_info_to_ui (const ET_File *ETFile);
 void et_mac_file_header_fields_free (EtFileHeaderFields *fields);
 
 G_END_DECLS
diff --git a/src/tags/mp4_header.cc b/src/tags/mp4_header.cc
index 4921eb0..c6578d9 100644
--- a/src/tags/mp4_header.cc
+++ b/src/tags/mp4_header.cc
@@ -111,13 +111,12 @@ mp4_header_read_file_info (const gchar *filename,
 }
 
 /*
- * Mp4_Header_Display_File_Info_To_UI:
+ * et_mp4_header_display_file_info_to_ui:
  *
  * Display header info in the main window
  */
 EtFileHeaderFields *
-Mp4_Header_Display_File_Info_To_UI (const gchar *filename, 
-                                    const ET_File *ETFile)
+et_mp4_header_display_file_info_to_ui (const ET_File *ETFile)
 {
     EtFileHeaderFields *fields;
     ET_File_Info *info;
diff --git a/src/tags/mp4_header.h b/src/tags/mp4_header.h
index 891e3dd..81700ca 100644
--- a/src/tags/mp4_header.h
+++ b/src/tags/mp4_header.h
@@ -26,7 +26,7 @@
 G_BEGIN_DECLS
 
 gboolean mp4_header_read_file_info (const gchar *filename, ET_File_Info *ETFileInfo, GError **error);
-EtFileHeaderFields * Mp4_Header_Display_File_Info_To_UI (const gchar *filename, const ET_File *ETFile);
+EtFileHeaderFields * et_mp4_header_display_file_info_to_ui (const ET_File *ETFile);
 void et_mp4_file_header_fields_free (EtFileHeaderFields *fields);
 
 G_END_DECLS
diff --git a/src/tags/mpeg_header.c b/src/tags/mpeg_header.c
index beed5ca..4e67119 100644
--- a/src/tags/mpeg_header.c
+++ b/src/tags/mpeg_header.c
@@ -174,8 +174,7 @@ mpeg_header_read_file_info (const gchar *filename,
 
 /* For displaying header information in the main window. */
 EtFileHeaderFields *
-Mpeg_Header_Display_File_Info_To_UI (const gchar *filename_utf8,
-                                     const ET_File *ETFile)
+et_mpeg_header_display_file_info_to_ui (const ET_File *ETFile)
 {
     EtFileHeaderFields *fields;
     ET_File_Info *info;
diff --git a/src/tags/mpeg_header.h b/src/tags/mpeg_header.h
index 14fa00f..6d4e904 100644
--- a/src/tags/mpeg_header.h
+++ b/src/tags/mpeg_header.h
@@ -25,7 +25,7 @@
 G_BEGIN_DECLS
 
 gboolean mpeg_header_read_file_info (const gchar *filename, ET_File_Info *ETFileInfo, GError **error);
-EtFileHeaderFields * Mpeg_Header_Display_File_Info_To_UI (const gchar *filename, const ET_File *ETFile);
+EtFileHeaderFields * et_mpeg_header_display_file_info_to_ui (const ET_File *ETFile);
 void et_mpeg_file_header_fields_free (EtFileHeaderFields *fields);
 
 G_END_DECLS
diff --git a/src/tags/musepack_header.c b/src/tags/musepack_header.c
index 3c20d9c..9c0e4f5 100644
--- a/src/tags/musepack_header.c
+++ b/src/tags/musepack_header.c
@@ -1,7 +1,7 @@
 /* EasyTAG - Tag editor for audio files
  * Copyright (C) 2014  David King <amigadave amigadave com>
  * Copyright (C) 2001-2003  Jerome Couderc <easytag gmail com>
- * Copyright (C) 2002-2003  Artur Polaczy�ski <artii o2 pl>
+ * Copyright (C) 2002-2003  Artur Polaczyñski <artii o2 pl>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,8 +71,7 @@ mpc_header_read_file_info (const gchar *filename,
 }
 
 EtFileHeaderFields *
-Mpc_Header_Display_File_Info_To_UI (const gchar *filename_utf8,
-                                    const ET_File *ETFile)
+et_mpc_header_display_file_info_to_ui (const ET_File *ETFile)
 {
     EtFileHeaderFields *fields;
     ET_File_Info *info;
diff --git a/src/tags/musepack_header.h b/src/tags/musepack_header.h
index c0c2fcd..58da0e8 100644
--- a/src/tags/musepack_header.h
+++ b/src/tags/musepack_header.h
@@ -1,7 +1,7 @@
 /* EasyTAG - Tag editor for audio files
  * Copyright (C) 2014  David King <amigadave amigadave com>
  * Copyright (C) 2000-2003  Jerome Couderc <easytag gmail com>
- * Copyright (C) 2002-2003  Artur Polaczy�ski <artii o2 pl>
+ * Copyright (C) 2002-2003  Artur Polaczyñski <artii o2 pl>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 G_BEGIN_DECLS
 
 gboolean mpc_header_read_file_info (const gchar *filename, ET_File_Info *ETFileInfo, GError **error);
-EtFileHeaderFields * Mpc_Header_Display_File_Info_To_UI (const gchar *filename, const ET_File *ETFile);
+EtFileHeaderFields * et_mpc_header_display_file_info_to_ui (const ET_File *ETFile);
 void et_mpc_file_header_fields_free (EtFileHeaderFields *fields);
 
 G_END_DECLS
diff --git a/src/tags/ogg_header.c b/src/tags/ogg_header.c
index 2475f41..c86a4d7 100644
--- a/src/tags/ogg_header.c
+++ b/src/tags/ogg_header.c
@@ -377,8 +377,7 @@ speex_header_read_file_info (const gchar *filename,
 #endif
 
 EtFileHeaderFields *
-Ogg_Header_Display_File_Info_To_UI (const gchar *filename,
-                                    const ET_File *ETFile)
+et_ogg_header_display_file_info_to_ui (const ET_File *ETFile)
 {
     EtFileHeaderFields *fields;
     ET_File_Info *info;
diff --git a/src/tags/ogg_header.h b/src/tags/ogg_header.h
index 1a11486..b4dfed3 100644
--- a/src/tags/ogg_header.h
+++ b/src/tags/ogg_header.h
@@ -72,7 +72,7 @@ typedef enum
 gboolean ogg_header_read_file_info (const gchar *filename,
                                     ET_File_Info *ETFileInfo,
                                     GError **error);
-EtFileHeaderFields * Ogg_Header_Display_File_Info_To_UI (const gchar *filename, const ET_File *ETFile);
+EtFileHeaderFields * et_ogg_header_display_file_info_to_ui (const ET_File *ETFile);
 void et_ogg_file_header_fields_free (EtFileHeaderFields *fields);
 
 gboolean speex_header_read_file_info (const gchar *filename, ET_File_Info *ETFileInfo, GError **error);
diff --git a/src/tags/opus_header.c b/src/tags/opus_header.c
index 4bd8ef4..464d4db 100644
--- a/src/tags/opus_header.c
+++ b/src/tags/opus_header.c
@@ -209,8 +209,7 @@ et_opus_read_file_info (GFile *gfile, ET_File_Info *ETFileInfo,
  * et_opus_file_header_fields_free()
  */
 EtFileHeaderFields *
-et_opus_header_display_file_info_to_ui (GFile *file,
-                                        const ET_File *ETFile)
+et_opus_header_display_file_info_to_ui (const ET_File *ETFile)
 {
     EtFileHeaderFields *fields;
     ET_File_Info *info;
diff --git a/src/tags/opus_header.h b/src/tags/opus_header.h
index 4d34415..7d45956 100644
--- a/src/tags/opus_header.h
+++ b/src/tags/opus_header.h
@@ -60,7 +60,7 @@ typedef enum
 
 gboolean et_opus_read_file_info (GFile *gfile, ET_File_Info *ETFileInfo, GError **error);
 OggOpusFile * et_opus_open_file (GFile *gfile, GError **error);
-EtFileHeaderFields * et_opus_header_display_file_info_to_ui (GFile *gfile, const ET_File *ETFile);
+EtFileHeaderFields * et_opus_header_display_file_info_to_ui (const ET_File *ETFile);
 void et_opus_file_header_fields_free (EtFileHeaderFields *fields);
 
 #endif /* ET_OPUS_HEADER_H_ */
diff --git a/src/tags/wavpack_header.c b/src/tags/wavpack_header.c
index 87e1f3b..46f2fbc 100644
--- a/src/tags/wavpack_header.c
+++ b/src/tags/wavpack_header.c
@@ -69,8 +69,7 @@ wavpack_header_read_file_info (const gchar *filename,
 }
 
 EtFileHeaderFields *
-Wavpack_Header_Display_File_Info_To_UI (const gchar *filename_utf8,
-                                        const ET_File *ETFile)
+et_wavpack_header_display_file_info_to_ui (const ET_File *ETFile)
 {
     EtFileHeaderFields *fields;
     ET_File_Info *info;
diff --git a/src/tags/wavpack_header.h b/src/tags/wavpack_header.h
index b323f5d..12ed760 100644
--- a/src/tags/wavpack_header.h
+++ b/src/tags/wavpack_header.h
@@ -25,7 +25,7 @@
 G_BEGIN_DECLS
 
 gboolean wavpack_header_read_file_info (const gchar *filename, ET_File_Info *ETFileInfo, GError **error);
-EtFileHeaderFields * Wavpack_Header_Display_File_Info_To_UI (const gchar *filename_utf8, const ET_File 
*ETFile);
+EtFileHeaderFields * et_wavpack_header_display_file_info_to_ui (const ET_File *ETFile);
 void et_wavpack_file_header_fields_free (EtFileHeaderFields *fields);
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]