Set a module load priority for format modules.

A recent change to app_voicemail made it such that the module now assumes that
all format modules are available while processing voicemail configuration.
However, when autoloading modules, it was possible that app_voicemail was
loaded before the format modules. Since format modules don't depend on
anything, set a module load priority on them to ensure that they get loaded
first when autoloading.

This version of the patch is specific to Asterisk 1.4 and 1.6.0.  These versions
did not already support module load priority in the module API.  This adds a
trivial version of this which is just a module flag to include it in a pass before
loading "everything".

Thanks to mmichelson for the review!

(closes issue #16412)
Reported by: jiddings
Tested by: russell

Review: https://reviewboard.asterisk.org/r/445/


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@233782 f38db490-d61c-443f-a65b-d21fe96a405b

14 files changed, 56 insertions, 14 deletions

diff --git a/formats/format_g723.c b/formats/format_g723.c
index dd5a1e6af..c394b0f1e 100644
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -160,4 +160,7 @@ static int unload_module(void)
 	return ast_format_unregister(g723_1_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "G.723.1 Simple Timestamp File Format");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "G.723.1 Simple Timestamp File Format",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 499d545d2..fbb7e4791 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -274,4 +274,7 @@ static int unload_module(void)
 	return(0);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G.726 (16/24/32/40kbps) data");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Raw G.726 (16/24/32/40kbps) data",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 3f46bcbff..a596c521c 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -156,4 +156,7 @@ static int unload_module(void)
 	return ast_format_unregister(g729_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw G729 data");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Raw G729 data",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 37fbd2382..9318fa3cf 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -180,4 +180,7 @@ static int unload_module(void)
 	return ast_format_unregister(gsm_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw GSM data");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Raw GSM data",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_h263.c b/formats/format_h263.c
index baa7a3efd..7cbcc8d4e 100644
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -194,4 +194,7 @@ static int unload_module(void)
 	return ast_format_unregister(h263_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.263 data");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Raw H.263 data",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_h264.c b/formats/format_h264.c
index bc70a75c7..70b9dd948 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -183,4 +183,7 @@ static int unload_module(void)
 	return ast_format_unregister(h264_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw H.264 data");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Raw H.264 data",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index 659f42dbd..906ca9264 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -154,4 +154,7 @@ static int unload_module(void)
 	return ast_format_unregister(ilbc_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw iLBC data");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Raw iLBC data",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index edef171d2..64c197a99 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -124,4 +124,7 @@ static int unload_module(void)
 	return 0;
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "JPEG (Joint Picture Experts Group) Image Format");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "JPEG (Joint Picture Experts Group) Image Format",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index 7e20c0004..5a89098d6 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -568,5 +568,8 @@ static int unload_module(void)
 	return ast_format_unregister(vorbis_f.name);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "OGG/Vorbis audio");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "OGG/Vorbis audio",
+	.load = load_module,
+	.unload = unload_module,
+);
 
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index a3deced7a..a1292e11f 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -504,4 +504,7 @@ static int unload_module(void)
 		|| ast_format_unregister(g722_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Raw/Sun uLaw/ALaw 8KHz (PCM,PCMA,AU), G.722 16Khz",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_sln.c b/formats/format_sln.c
index c8c5cc04b..d085b131b 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -138,4 +138,7 @@ static int unload_module(void)
 	return ast_format_unregister(slin_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Raw Signed Linear Audio support (SLN)");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Raw Signed Linear Audio support (SLN)",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_vox.c b/formats/format_vox.c
index c729f3b5c..ef0697d33 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -143,4 +143,7 @@ static int unload_module(void)
 	return ast_format_unregister(vox_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Dialogic VOX (ADPCM) File Format");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Dialogic VOX (ADPCM) File Format",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_wav.c b/formats/format_wav.c
index de92e881e..38c0fc7a8 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -528,4 +528,7 @@ static int unload_module(void)
 	return ast_format_unregister(wav_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (8000Hz Signed Linear)");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Microsoft WAV format (8000Hz Signed Linear)",
+	.load = load_module,
+	.unload = unload_module,
+);
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index f82f9bc23..7e589bb88 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -559,4 +559,7 @@ static int unload_module(void)
 	return ast_format_unregister(wav49_f.name);
 }	
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Microsoft WAV format (Proprietary GSM)");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_FIRST, "Microsoft WAV format (Proprietary GSM)",
+	.load = load_module,
+	.unload = unload_module,
+);