From: Andre Noll <maan@tuebingen.mpg.de>
Date: Fri, 14 Jul 2017 18:05:21 +0000 (+0200)
Subject: afh: Unify name of init functions.
X-Git-Tag: v0.6.1~53
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=a85b3b947174c64ce06b4d6e438677055bf3f1ae;hp=34be2cc6668b2297566de312250f6c0104796f65

afh: Unify name of init functions.

The init functions of the mp3 and ogg audio format handlers lacked
the _afh part in the name which all other audio format handlers have.
---

diff --git a/afh_common.c b/afh_common.c
index 4d8884a6..b47def87 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -17,7 +17,7 @@
 
 typedef void afh_init_func(struct audio_format_handler *);
 /* It does not hurt to declare init functions which are not available. */
-extern afh_init_func mp3_init, ogg_init, aac_afh_init, wma_afh_init,
+extern afh_init_func mp3_afh_init, ogg_afh_init, aac_afh_init, wma_afh_init,
 	spx_afh_init, flac_afh_init, opus_afh_init;
 
 /** The list of all status items */
@@ -38,12 +38,12 @@ const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 static struct audio_format_handler afl[] = {
 	{
 		.name = "mp3",
-		.init = mp3_init,
+		.init = mp3_afh_init,
 	},
 	{
 		.name = "ogg",
 #if defined(HAVE_OGG) && defined(HAVE_VORBIS)
-		.init = ogg_init,
+		.init = ogg_afh_init,
 #endif
 	},
 	{
diff --git a/mp3_afh.c b/mp3_afh.c
index e5d0ff13..08837bec 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -690,7 +690,7 @@ static const char * const mp3_suffixes[] = {"mp3", NULL};
  *
  * \param afh pointer to the struct to initialize
  */
-void mp3_init(struct audio_format_handler *afh)
+void mp3_afh_init(struct audio_format_handler *afh)
 {
 	afh->get_file_info = mp3_get_file_info;
 	afh->suffixes = mp3_suffixes;
diff --git a/ogg_afh.c b/ogg_afh.c
index 2ddf0ee3..cb0611e0 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -212,7 +212,7 @@ static const char * const ogg_suffixes[] = {"ogg", NULL};
  *
  * \param afh Pointer to the struct to initialize.
  */
-void ogg_init(struct audio_format_handler *afh)
+void ogg_afh_init(struct audio_format_handler *afh)
 {
 	afh->get_file_info = ogg_vorbis_get_file_info;
 	afh->get_header = vorbis_get_header;