the last round of file version tags

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5867 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index fbd6c92..2dee63f 100755 (executable)
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -12,15 +12,6 @@
  */
 
 #include <sys/types.h>
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/adsi.h"
-#include "asterisk/options.h"
-#include "asterisk/utils.h"
-#include "asterisk/lock.h"
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -32,6 +23,18 @@
 
 #include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/adsi.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
+
 static char *tdesc = "Asterisk ADSI Programming Application";
 
 static char *app = "ADSIProg";

diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 5948697..324d656 100755 (executable)
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -18,6 +18,18 @@
  *
  */ 
  
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -33,13 +45,6 @@
 #include "asterisk/localtime.h"
 #include "asterisk/callerid.h"
 #include "asterisk/astdb.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <sys/time.h>
 
 #define ALMRCV_CONFIG "alarmreceiver.conf"
 #define ADEMCO_CONTACT_ID "ADEMCO_CONTACT_ID"

diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index e64b514..d1383eb 100755 (executable)
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -11,6 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,12 +30,6 @@
 #include "asterisk/app.h"
 #include "asterisk/astdb.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 static char *tdesc = "Authentication Application";
 

diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index 8e6752a..9d9bfde 100755 (executable)
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -12,10 +12,15 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include <stdlib.h>
 
 
 static char *tdesc = "Make sure asterisk doesn't save CDR for a certain call";

diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 4047f6b..1fe3741 100755 (executable)
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -13,6 +13,17 @@
  *
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,12 +31,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
 
 static char *tdesc = "Check if channel is available";
 

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 656b769..7ed00cd 100755 (executable)
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -17,6 +17,9 @@
 #include <ctype.h>
 
 #include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"

diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 02a1cd3..30b5c90 100755 (executable)
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,8 +27,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Control Playback Application";
 

diff --git a/apps/app_curl.c b/apps/app_curl.c
index f81071a..572622b 100755 (executable)
--- a/apps/app_curl.c
+++ b/apps/app_curl.c
@@ -12,6 +12,14 @@
  * redistribution.
  */
  
+#include <stdlib.h>
+#include <string.h>
+#include <curl/curl.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,9 +28,6 @@
 #include "asterisk/cli.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <string.h>
-#include <curl/curl.h>
 
 static char *tdesc = "Load external URL";
 

diff --git a/apps/app_cut.c b/apps/app_cut.c
index 359c286..b5d9e93 100755 (executable)
--- a/apps/app_cut.c
+++ b/apps/app_cut.c
@@ -17,6 +17,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"

diff --git a/apps/app_datetime.c b/apps/app_datetime.c
index 470a4fb..994102c 100755 (executable)
--- a/apps/app_datetime.c
+++ b/apps/app_datetime.c
@@ -11,6 +11,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -18,10 +26,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/say.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Date and Time";
 

diff --git a/apps/app_db.c b/apps/app_db.c
index d1677b8..1cbbd9d 100755 (executable)
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -17,6 +17,11 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/options.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 12794ef..e997637 100755 (executable)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -11,6 +11,20 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/signal.h>
+#include <netinet/in.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -28,15 +42,6 @@
 #include "asterisk/app.h"
 #include "asterisk/causes.h"
 #include "asterisk/manager.h"
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <netinet/in.h>
 
 static char *tdesc = "Dialing Application";
 

diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 531efaa..76ee092 100755 (executable)
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -17,6 +17,11 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/stat.h>  /* for mkdir */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -25,7 +30,6 @@
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
-#include "asterisk.h"
 
 static char *tdesc = "Virtual Dictation Machine";
 static char *app = "Dictate";

diff --git a/apps/app_directory.c b/apps/app_directory.c
index 870fd5a..1e451ee 100755 (executable)
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -11,6 +11,15 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,11 +29,6 @@
 #include "asterisk/config.h"
 #include "asterisk/say.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "asterisk.h"
 
 static char *tdesc = "Extension Directory";
 static char *app = "Directory";

diff --git a/apps/app_disa.c b/apps/app_disa.c
index ee59856..2007644 100755 (executable)
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -13,6 +13,16 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <sys/time.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -24,12 +34,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/callerid.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <sys/time.h>
-
 
 static char *tdesc = "DISA (Direct Inward System Access) Application";
 

diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 82c573d..6b43bfa 100755 (executable)
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -11,6 +11,14 @@
  * the GNU General Public License (and disclaimed to Digium)
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -20,9 +28,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 static char *tdesc = "Dump Info About The Calling Channel";
 static char *app = "DumpChan";

diff --git a/apps/app_echo.c b/apps/app_echo.c
index 425e0e5..b3ba0eb 100755 (executable)
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -11,16 +11,20 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Simple Echo Application";
 

diff --git a/apps/app_enumlookup.c b/apps/app_enumlookup.c
index 717e3f3..f0feaea 100755 (executable)
--- a/apps/app_enumlookup.c
+++ b/apps/app_enumlookup.c
@@ -11,6 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,11 +31,6 @@
 #include "asterisk/module.h"
 #include "asterisk/enum.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 static char *tdesc = "ENUM Lookup";
 

diff --git a/apps/app_eval.c b/apps/app_eval.c
index 73b99c0..c1f646b 100755 (executable)
--- a/apps/app_eval.c
+++ b/apps/app_eval.c
@@ -17,6 +17,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"

diff --git a/apps/app_exec.c b/apps/app_exec.c
index d07b007..49ce3e4 100755 (executable)
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -17,6 +17,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"

diff --git a/apps/app_festival.c b/apps/app_festival.c
index 44dbd9c..cbe1786 100755 (executable)
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -12,15 +12,6 @@
  */
 
 #include <sys/types.h>
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/md5.h"
-#include "asterisk/config.h"
-#include "asterisk/utils.h"
-#include "asterisk/lock.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -37,6 +28,19 @@
 #include <fcntl.h>
 #include <ctype.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/md5.h"
+#include "asterisk/config.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
 
 #define FESTIVAL_CONFIG "festival.conf"
 

diff --git a/apps/app_flash.c b/apps/app_flash.c
index 7514ef0..dda5bcc 100755 (executable)
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -14,6 +14,17 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <sys/ioctl.h>
+#ifdef __linux__
+#include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -23,12 +34,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
 #include "asterisk/options.h"
-#include <sys/ioctl.h>
-#ifdef __linux__
-#include <linux/zaptel.h>
-#else
-#include <zaptel.h>
-#endif /* __linux__ */
 
 static char *tdesc = "Flash zap trunk application";
 

diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index a398333..1452b0e 100755 (executable)
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -9,16 +9,21 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <pthread.h>
 
 static char *tdesc = "Fork The CDR into 2 separate entities.";
 static char *app = "ForkCDR";

diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 2095498..1c02774 100755 (executable)
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -11,6 +11,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,10 +27,6 @@
 #include "asterisk/module.h"
 #include "asterisk/adsi.h"
 #include "asterisk/options.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Get ADSI CPE ID";
 

diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c
index d175210..d9a841f 100755 (executable)
--- a/apps/app_groupcount.c
+++ b/apps/app_groupcount.c
@@ -18,6 +18,10 @@
 #include <sys/types.h>
 #include <regex.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"

diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c
index 7dc3980..08bcc7a 100755 (executable)
--- a/apps/app_hasnewvoicemail.c
+++ b/apps/app_hasnewvoicemail.c
@@ -32,6 +32,15 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <dirent.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -39,13 +48,6 @@
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dirent.h>
-
-#include "asterisk.h"
 
 static char *tdesc = "Indicator for whether a voice mailbox has messages in a given folder.";
 static char *app_hasvoicemail = "HasVoicemail";

diff --git a/apps/app_ices.c b/apps/app_ices.c
index 6e1629d..ae9e238 100755 (executable)
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -11,14 +11,6 @@
  * the GNU General Public License
  */
  
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/frame.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/translate.h"
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
@@ -27,8 +19,20 @@
 #include <fcntl.h>
 #include <sys/time.h>
 #include <errno.h>
+
 #include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/frame.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
 #define ICES "/usr/bin/ices"
 #define LOCAL_ICES "/usr/local/bin/ices"
 

diff --git a/apps/app_image.c b/apps/app_image.c
index 44ed0b8..9c0d05c 100755 (executable)
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,8 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Image Transmission Application";
 

diff --git a/apps/app_intercom.c b/apps/app_intercom.c
index 53a6ec4..e119997 100755 (executable)
--- a/apps/app_intercom.c
+++ b/apps/app_intercom.c
@@ -11,14 +11,6 @@
  * the GNU General Public License
  */
  
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/frame.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/translate.h"
 #include <unistd.h>
 #include <errno.h>
 #include <sys/ioctl.h>
@@ -35,6 +27,19 @@
 #include <soundcard.h>
 #endif
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/frame.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
 #ifdef __OpenBSD__
 #define DEV_DSP "/dev/audio"
 #else

diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index 420225a..fb16d40 100755 (executable)
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -11,6 +11,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -18,9 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 static char *tdesc = "IVR Demo Application";
 static char *app = "IVRDemo";

diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c
index 42bc18e..278f274 100755 (executable)
--- a/apps/app_lookupblacklist.c
+++ b/apps/app_lookupblacklist.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,8 +29,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/astdb.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Look up Caller*ID name/number from blacklist database";
 

diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c
index f41411a..beaf02a 100755 (executable)
--- a/apps/app_lookupcidname.c
+++ b/apps/app_lookupcidname.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,8 +29,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/astdb.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Look up CallerID Name from local database";
 

diff --git a/apps/app_macro.c b/apps/app_macro.c
index 43ad368..25d2aa8 100755 (executable)
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -12,6 +12,14 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -21,10 +29,6 @@
 #include "asterisk/config.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 #define MAX_ARGS 80
 

diff --git a/apps/app_math.c b/apps/app_math.c
index 9d040ff..fad0ad7 100755 (executable)
--- a/apps/app_math.c
+++ b/apps/app_math.c
@@ -9,6 +9,24 @@
  *
  */
 
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <sys/file.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -23,22 +41,8 @@
 #include "asterisk/localtime.h"
 #include "asterisk/cli.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-#include <dirent.h>
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include <ctype.h>
-#include <sys/file.h>
-#include "asterisk.h"
 
 static char *tdesc = "Basic Math Functions";
 

diff --git a/apps/app_md5.c b/apps/app_md5.c
index 369e683..0e92c1c 100755 (executable)
--- a/apps/app_md5.c
+++ b/apps/app_md5.c
@@ -9,6 +9,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/utils.h"
@@ -17,9 +25,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 static char *tdesc_md5 = "MD5 checksum applications";
 static char *app_md5 = "MD5";

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index c7b1c92..ab33c05 100755 (executable)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -11,6 +11,22 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#ifdef __linux__
+#include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -26,19 +42,6 @@
 #include "asterisk/cli.h"
 #include "asterisk/say.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include "asterisk.h"
-
-#ifdef __linux__
-#include <linux/zaptel.h>
-#else
-#include <zaptel.h>
-#endif /* __linux__ */
 
 static char *tdesc = "MeetMe conference bridge";
 

diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 4f729cd..d7e5c0e 100755 (executable)
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -11,17 +11,22 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
 
 static char *tdesc = "Digital Milliwatt (mu-law) Test Application";
 

diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 4a4bcf0..1b21d33 100755 (executable)
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -11,6 +11,18 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdio.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,13 +31,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include <string.h>
-#include <stdio.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/time.h>
 
 #define LOCAL_MPG_123 "/usr/local/bin/mpg123"
 #define MPG_123 "/usr/bin/mpg123"

diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 13f3e7a..aa5e44d 100755 (executable)
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -11,14 +11,6 @@
  * the GNU General Public License
  */
  
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/frame.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/translate.h"
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
@@ -28,6 +20,19 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/frame.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
 #define LOCAL_NBSCAT "/usr/local/bin/nbscat8k"
 #define NBSCAT "/usr/bin/nbscat8k"
 

diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index de08e44..72eded6 100755 (executable)
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -11,6 +11,15 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,11 +31,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/causes.h"
 #include "asterisk/astosp.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 static char *tdesc = "OSP Lookup";
 

diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index 0c8e719..37227b8 100755 (executable)
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -15,6 +15,14 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -26,11 +34,6 @@
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
 static char *tdesc = "Call Parking and Announce Application";
 
 static char *app = "ParkAndAnnounce";

diff --git a/apps/app_playback.c b/apps/app_playback.c
index 26b2046..7e7cabe 100755 (executable)
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,8 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Sound File Playback Application";
 

diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 7eab0dd..cb2bb01 100755 (executable)
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/utils.h"
@@ -24,8 +31,6 @@
 #include "asterisk/callerid.h"
 #include "asterisk/app.h"
 #include "asterisk/config.h"
-#include <string.h>
-#include <stdlib.h>
 
 #define PRIV_CONFIG "privacy.conf"
 

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 0e759aa..c4f2de1 100755 (executable)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -39,6 +39,20 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/signal.h>
+#include <netinet/in.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -57,17 +71,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/causes.h"
 #include "asterisk/astdb.h"
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <netinet/in.h>
-
-#include "asterisk.h"
 
 #define QUEUE_STRATEGY_RINGALL         0
 #define QUEUE_STRATEGY_ROUNDROBIN      1

diff --git a/apps/app_random.c b/apps/app_random.c
index d49af9f..70f7799 100755 (executable)
--- a/apps/app_random.c
+++ b/apps/app_random.c
@@ -11,17 +11,21 @@
  *
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
 
 static char *tdesc = "Random goto";
 

diff --git a/apps/app_read.c b/apps/app_read.c
index 6f63d2d..0f0ab37 100755 (executable)
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,8 +28,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Read Variable Application";
 

diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 5e09efc..733dd10 100755 (executable)
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -16,6 +16,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"

diff --git a/apps/app_realtime.c b/apps/app_realtime.c
index 6ae64f5..d4ded9c 100755 (executable)
--- a/apps/app_realtime.c
+++ b/apps/app_realtime.c
@@ -12,6 +12,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -21,9 +29,6 @@
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/cli.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 #define next_one(var) var = var->next
 #define crop_data(str) { *(str) = '\0' ; (str)++; }

diff --git a/apps/app_record.c b/apps/app_record.c
index 4108818..c5da8f9 100755 (executable)
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,8 +27,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/dsp.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Trivial Record Application";
 

diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 44f6a80..f04ce56 100755 (executable)
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -120,20 +120,6 @@ enum {SOURCE_RPT, SOURCE_LNK, SOURCE_RMT};
 
 enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM};
 
-#include <asterisk/utils.h>
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/callerid.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/options.h>
-#include <asterisk/cli.h>
-#include <asterisk/config.h>
-#include <asterisk/say.h>
-#include <asterisk/localtime.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -154,6 +140,25 @@ enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM};
 #include <tonezone.h>
 #include <linux/zaptel.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/callerid.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/options.h"
+#include "asterisk/cli.h"
+#include "asterisk/config.h"
+#include "asterisk/say.h"
+#include "asterisk/localtime.h"
+
 static  char *tdesc = "Radio Repeater / Remote Base  version 0.24  05/15/2005";
 
 static char *app = "Rpt";

diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 05b0859..a641779 100755 (executable)
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -15,6 +15,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/options.h"

diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index d74a8b4..c707d82 100755 (executable)
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,8 +28,6 @@
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Send DTMF digits Application";
 

diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 391b2b2..3f935b8 100755 (executable)
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,8 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Send Text Applications";
 

diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 86cf9bd..68e9653 100755 (executable)
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,8 +27,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *app2 = "SetCallerPres";
 

diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c
index 7e820db..39c17de 100755 (executable)
--- a/apps/app_setcdruserfield.c
+++ b/apps/app_setcdruserfield.c
@@ -12,6 +12,13 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/channel.h"
 #include "asterisk/cdr.h"
 #include "asterisk/module.h"
@@ -20,8 +27,6 @@
 #include "asterisk/config.h"
 #include "asterisk/manager.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <string.h>
 
 
 static char *tdesc = "CDR user field apps";

diff --git a/apps/app_setcidname.c b/apps/app_setcidname.c
index 9a8dc2b..20cb23e 100755 (executable)
--- a/apps/app_setcidname.c
+++ b/apps/app_setcidname.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,8 +28,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Set CallerID Name";
 

diff --git a/apps/app_setcidnum.c b/apps/app_setcidnum.c
index 481c1dc..5169979 100755 (executable)
--- a/apps/app_setcidnum.c
+++ b/apps/app_setcidnum.c
@@ -12,6 +12,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,8 +29,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Set CallerID Number";
 

diff --git a/apps/app_setrdnis.c b/apps/app_setrdnis.c
index 0192973..542f039 100755 (executable)
--- a/apps/app_setrdnis.c
+++ b/apps/app_setrdnis.c
@@ -12,6 +12,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -22,8 +29,6 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Set RDNIS Number";
 

diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c
index 6a57c59..d9c6dc5 100755 (executable)
--- a/apps/app_settransfercapability.c
+++ b/apps/app_settransfercapability.c
@@ -11,15 +11,19 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 #include "asterisk/transcap.h"
-#include <string.h>
-#include <stdlib.h>
-#include "asterisk/transcap.h"
 
 
 static char *app = "SetTransferCapability";

diff --git a/apps/app_skel.c b/apps/app_skel.c
index f1910a5..ecd54ae 100755 (executable)
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -11,6 +11,14 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -18,9 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 static char *tdesc = "Trivial skeleton Application";
 static char *app = "skel";

diff --git a/apps/app_sms.c b/apps/app_sms.c
index 93b7d15..d677ffb 100755 (executable)
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -9,26 +9,29 @@
  * the GNU General Public License
  */
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/options.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/alaw.h"
-#include "asterisk/callerid.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <ctype.h>
+
 #include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/alaw.h"
+#include "asterisk/callerid.h"
+
 /* output using Alaw rather than linear */
 /* #define OUTALAW */
 

diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index 124f270..14b711d 100755 (executable)
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -12,16 +12,20 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *synopsis = "Soft Hangup Application";
 

diff --git a/apps/app_sql_postgres.c b/apps/app_sql_postgres.c
index 3185dad..e891cd3 100755 (executable)
--- a/apps/app_sql_postgres.c
+++ b/apps/app_sql_postgres.c
@@ -11,6 +11,17 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -19,13 +30,7 @@
 #include "asterisk/linkedlists.h"
 #include "asterisk/chanvars.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
+
 #include "libpq-fe.h"
 
 #define EXTRA_LOG 0

diff --git a/apps/app_striplsd.c b/apps/app_striplsd.c
index cc23309..0e94e56 100755 (executable)
--- a/apps/app_striplsd.c
+++ b/apps/app_striplsd.c
@@ -11,17 +11,21 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
 #include <sys/types.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Strip trailing digits";
 

diff --git a/apps/app_substring.c b/apps/app_substring.c
index 5f0609e..a92f375 100755 (executable)
--- a/apps/app_substring.c
+++ b/apps/app_substring.c
@@ -12,6 +12,15 @@
  */
 
 #include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -19,10 +28,6 @@
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "(Deprecated) Save substring digits in a given variable";
 

diff --git a/apps/app_system.c b/apps/app_system.c
index ace3073..d1ec120 100755 (executable)
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -11,6 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -18,11 +28,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
 
 static char *tdesc = "Generic System() application";
 

diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 4d4d266..52aaa78 100755 (executable)
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,8 +27,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
 #include "asterisk/dsp.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Playback with Talk Detection";
 

diff --git a/apps/app_test.c b/apps/app_test.c
index 2d9a075..bbb54c1 100755 (executable)
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -14,6 +14,15 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/channel.h"
 #include "asterisk/options.h"
 #include "asterisk/module.h"
@@ -22,12 +31,6 @@
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include "asterisk.h"
-
 
 static char *tdesc = "Interface Test Application";
 

diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 517a2c4..c56385b 100755 (executable)
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -11,16 +11,20 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Transfer";
 

diff --git a/apps/app_txtcidname.c b/apps/app_txtcidname.c
index dc39106..e357e9a 100755 (executable)
--- a/apps/app_txtcidname.c
+++ b/apps/app_txtcidname.c
@@ -11,6 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -21,11 +31,6 @@
 #include "asterisk/module.h"
 #include "asterisk/enum.h"
 #include "asterisk/utils.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 
 static char *tdesc = "TXTCIDName";
 

diff --git a/apps/app_url.c b/apps/app_url.c
index df63a08..4066b8d 100755 (executable)
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -19,8 +26,6 @@
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Send URL Applications";
 

diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 71890be..6830750 100755 (executable)
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -8,6 +8,15 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -15,10 +24,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/manager.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Custom User Event Application";
 

diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 5d767b9..2ab50b6 100755 (executable)
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -15,6 +15,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/options.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 57f06e1..084dc61 100755 (executable)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -15,6 +15,23 @@
  * 05-10 - 2005 : Support for Swedish and Norwegian added by Daniel Nylander, http://www.danielnylander.se/
  */
 
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <time.h>
+#include <dirent.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -34,20 +51,6 @@
 #ifdef USE_ODBC_STORAGE
 #include "asterisk/res_odbc.h"
 #endif
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <time.h>
-#include <dirent.h>
-
-#include "asterisk.h"
 
 #define COMMAND_TIMEOUT 5000
 

diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 93dec96..038defd 100755 (executable)
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -11,7 +11,16 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/types.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -19,10 +28,6 @@
 #include "asterisk/module.h"
 #include "asterisk/options.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 
 static char *synopsis = "Wait for Ring Application";
 

diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index b1294c1..3272017 100755 (executable)
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -17,6 +17,15 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -24,10 +33,6 @@
 #include "asterisk/dsp.h"
 #include "asterisk/module.h"
 #include "asterisk/options.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <pthread.h>
 
 static char *tdesc = "Wait For Silence";
 static char *app = "WaitForSilence";

diff --git a/apps/app_while.c b/apps/app_while.c
index 71e821a..5eb5999 100755 (executable)
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -20,9 +27,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 
 #define ALL_DONE(u,ret) {LOCAL_USER_REMOVE(u); return ret;}
 

diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 38ec03f..53c79ca 100755 (executable)
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -11,6 +11,13 @@
  * the GNU General Public License
  */
  
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
@@ -18,8 +25,6 @@
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include <string.h>
-#include <stdlib.h>
 
 static char *tdesc = "Block Telemarketers with Special Information Tone";
 

diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index dc02f8a..88b2466 100755 (executable)
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -14,18 +14,6 @@
  * GPL application.
  */
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/config.h"
-#include "asterisk/app.h"
-#include "asterisk/options.h"
-#include "asterisk/cli.h"
-#include "asterisk/say.h"
-#include "asterisk/utils.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -39,6 +27,23 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/config.h"
+#include "asterisk/app.h"
+#include "asterisk/options.h"
+#include "asterisk/cli.h"
+#include "asterisk/say.h"
+#include "asterisk/utils.h"
+
 static char *tdesc = "Barge in on Zap channel application";
 
 static char *app = "ZapBarge";

diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index 517bbb5..69900ea 100755 (executable)
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -11,13 +11,6 @@
  * the GNU General Public License
  */
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/options.h"
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #ifdef __linux__
@@ -41,6 +34,18 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/options.h"
+
 static char *tdesc = "Zap RAS Application";
 
 static char *app = "ZapRAS";

diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 9b153ed..a6480cb 100755 (executable)
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -16,18 +16,6 @@
  * GPL application.
  */
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/logger.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/config.h"
-#include "asterisk/app.h"
-#include "asterisk/options.h"
-#include "asterisk/utils.h"
-#include "asterisk/cli.h"
-#include "asterisk/say.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -41,6 +29,23 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/config.h"
+#include "asterisk/app.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/cli.h"
+#include "asterisk/say.h"
+
 static char *tdesc = "Scan Zap channels application";
 
 static char *app = "ZapScan";

diff --git a/asterisk.c b/asterisk.c
index 19534ea..52992fc 100755 (executable)
--- a/asterisk.c
+++ b/asterisk.c
@@ -210,6 +210,7 @@ static int handle_show_version_files(int fd, int argc, char *argv[])
        struct file_version *iterator;
        regex_t regexbuf;
        int havepattern = 0;
+       int havename = 0;
 
        switch (argc) {
        case 5:
@@ -220,6 +221,9 @@ static int handle_show_version_files(int fd, int argc, char *argv[])
                } else
                        return RESULT_SHOWUSAGE;
                break;
+       case 4:
+               havename = 1;
+               break;
        case 3:
                break;
        default:
@@ -230,10 +234,16 @@ static int handle_show_version_files(int fd, int argc, char *argv[])
        ast_cli(fd, FORMAT, "----", "--------");
        AST_LIST_LOCK(&file_versions);
        AST_LIST_TRAVERSE(&file_versions, iterator, list) {
+               if (havename && strcasecmp(iterator->file, argv[3]))
+                       continue;
+
                if (havepattern && regexec(&regexbuf, iterator->file, 0, NULL, 0))
                        continue;
 
                ast_cli(fd, FORMAT, iterator->file, iterator->version);
+
+               if (havename)
+                       break;
        }
        AST_LIST_UNLOCK(&file_versions);