From c0b1e88e8a9bd0dadf3b1302fd407de89fe51138 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 6 Jun 2005 22:39:32 +0000 Subject: [PATCH] the last round of file version tags git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5867 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_adsiprog.c | 21 +++++++++++--------- apps/app_alarmreceiver.c | 19 +++++++++++------- apps/app_authenticate.c | 16 ++++++++++------ apps/app_cdr.c | 7 ++++++- apps/app_chanisavail.c | 17 ++++++++++------ apps/app_chanspy.c | 3 +++ apps/app_controlplayback.c | 9 +++++++-- apps/app_curl.c | 11 ++++++++--- apps/app_cut.c | 5 +++++ apps/app_datetime.c | 12 ++++++++---- apps/app_db.c | 5 +++++ apps/app_dial.c | 23 +++++++++++++--------- apps/app_dictate.c | 6 +++++- apps/app_directory.c | 14 +++++++++----- apps/app_disa.c | 16 ++++++++++------ apps/app_dumpchan.c | 11 ++++++++--- apps/app_echo.c | 12 ++++++++---- apps/app_enumlookup.c | 15 ++++++++++----- apps/app_eval.c | 5 +++++ apps/app_exec.c | 5 +++++ apps/app_festival.c | 22 ++++++++++++--------- apps/app_flash.c | 17 ++++++++++------ apps/app_forkcdr.c | 13 +++++++++---- apps/app_getcpeid.c | 12 ++++++++---- apps/app_groupcount.c | 4 ++++ apps/app_hasnewvoicemail.c | 16 +++++++++------- apps/app_ices.c | 20 +++++++++++-------- apps/app_image.c | 9 +++++++-- apps/app_intercom.c | 21 ++++++++++++-------- apps/app_ivrdemo.c | 11 ++++++++--- apps/app_lookupblacklist.c | 9 +++++++-- apps/app_lookupcidname.c | 9 +++++++-- apps/app_macro.c | 12 ++++++++---- apps/app_math.c | 32 +++++++++++++++++-------------- apps/app_md5.c | 11 ++++++++--- apps/app_meetme.c | 29 +++++++++++++++------------- apps/app_milliwatt.c | 15 ++++++++++----- apps/app_mp3.c | 19 +++++++++++------- apps/app_nbscat.c | 21 ++++++++++++-------- apps/app_osplookup.c | 14 +++++++++----- apps/app_parkandannounce.c | 13 ++++++++----- apps/app_playback.c | 9 +++++++-- apps/app_privacy.c | 9 +++++++-- apps/app_queue.c | 25 +++++++++++++----------- apps/app_random.c | 14 +++++++++----- apps/app_read.c | 9 +++++++-- apps/app_readfile.c | 5 +++++ apps/app_realtime.c | 11 ++++++++--- apps/app_record.c | 9 +++++++-- apps/app_rpt.c | 33 ++++++++++++++++++-------------- apps/app_sayunixtime.c | 5 +++++ apps/app_senddtmf.c | 9 +++++++-- apps/app_sendtext.c | 9 +++++++-- apps/app_setcallerid.c | 9 +++++++-- apps/app_setcdruserfield.c | 9 +++++++-- apps/app_setcidname.c | 9 +++++++-- apps/app_setcidnum.c | 9 +++++++-- apps/app_setrdnis.c | 9 +++++++-- apps/app_settransfercapability.c | 10 +++++++--- apps/app_skel.c | 11 ++++++++--- apps/app_sms.c | 23 ++++++++++++---------- apps/app_softhangup.c | 12 ++++++++---- apps/app_sql_postgres.c | 19 +++++++++++------- apps/app_striplsd.c | 12 ++++++++---- apps/app_substring.c | 13 +++++++++---- apps/app_system.c | 15 ++++++++++----- apps/app_talkdetect.c | 9 +++++++-- apps/app_test.c | 15 +++++++++------ apps/app_transfer.c | 12 ++++++++---- apps/app_txtcidname.c | 15 ++++++++++----- apps/app_url.c | 9 +++++++-- apps/app_userevent.c | 13 +++++++++---- apps/app_verbose.c | 5 +++++ apps/app_voicemail.c | 31 ++++++++++++++++-------------- apps/app_waitforring.c | 13 +++++++++---- apps/app_waitforsilence.c | 13 +++++++++---- apps/app_while.c | 10 +++++++--- apps/app_zapateller.c | 9 +++++++-- apps/app_zapbarge.c | 29 ++++++++++++++++------------ apps/app_zapras.c | 19 +++++++++++------- apps/app_zapscan.c | 29 ++++++++++++++++------------ asterisk.c | 10 ++++++++++ 82 files changed, 743 insertions(+), 366 deletions(-) diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index fbd6c927ee..2dee63fdd1 100755 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -12,15 +12,6 @@ */ #include -#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 #include #include @@ -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 59486972f3..324d656ce9 100755 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -18,6 +18,18 @@ * */ +#include +#include +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include -#include -#include #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 e64b5147b3..d1383eb857 100755 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -11,6 +11,16 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include -#include static char *tdesc = "Authentication Application"; diff --git a/apps/app_cdr.c b/apps/app_cdr.c index 8e6752ac6d..9d9bfdef85 100755 --- a/apps/app_cdr.c +++ b/apps/app_cdr.c @@ -12,10 +12,15 @@ */ #include +#include + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/channel.h" #include "asterisk/module.h" #include "asterisk/pbx.h" -#include 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 4047f6ba9b..1fe374108c 100755 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -13,6 +13,17 @@ * */ +#include +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include -#include static char *tdesc = "Check if channel is available"; diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 656b76947a..7ed00cd313 100755 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -17,6 +17,9 @@ #include #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 02a1cd384e..30b5c9042e 100755 --- a/apps/app_controlplayback.c +++ b/apps/app_controlplayback.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Control Playback Application"; diff --git a/apps/app_curl.c b/apps/app_curl.c index f81071aa84..572622bae1 100755 --- a/apps/app_curl.c +++ b/apps/app_curl.c @@ -12,6 +12,14 @@ * redistribution. */ +#include +#include +#include + +#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 -#include -#include static char *tdesc = "Load external URL"; diff --git a/apps/app_cut.c b/apps/app_cut.c index 359c286ac7..b5d9e932cf 100755 --- a/apps/app_cut.c +++ b/apps/app_cut.c @@ -17,6 +17,11 @@ #include #include #include + +#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 470a4fbeec..994102c9fc 100755 --- a/apps/app_datetime.c +++ b/apps/app_datetime.c @@ -11,6 +11,14 @@ * the GNU General Public License */ +#include +#include +#include + +#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 -#include -#include -#include static char *tdesc = "Date and Time"; diff --git a/apps/app_db.c b/apps/app_db.c index d1677b858e..1cbbd9dc82 100755 --- a/apps/app_db.c +++ b/apps/app_db.c @@ -17,6 +17,11 @@ #include #include #include + +#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 12794ef76c..e9976375a0 100755 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -11,6 +11,20 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include -#include -#include -#include -#include static char *tdesc = "Dialing Application"; diff --git a/apps/app_dictate.c b/apps/app_dictate.c index 531efaa601..76ee092c73 100755 --- a/apps/app_dictate.c +++ b/apps/app_dictate.c @@ -17,6 +17,11 @@ #include #include #include /* 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 870fd5a690..1e451ee2ea 100755 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -11,6 +11,15 @@ * the GNU General Public License */ +#include +#include +#include +#include + +#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 -#include -#include -#include -#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 ee5985649e..200764478d 100755 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -13,6 +13,16 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include - static char *tdesc = "DISA (Direct Inward System Access) Application"; diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c index 82c573ddef..6b43bfa5d0 100755 --- a/apps/app_dumpchan.c +++ b/apps/app_dumpchan.c @@ -11,6 +11,14 @@ * the GNU General Public License (and disclaimed to Digium) */ +#include +#include +#include + +#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 -#include -#include 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 425e0e596b..b3ba0eb712 100755 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -11,16 +11,20 @@ * the GNU General Public License */ +#include +#include +#include + +#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 -#include -#include -#include static char *tdesc = "Simple Echo Application"; diff --git a/apps/app_enumlookup.c b/apps/app_enumlookup.c index 717e3f3fe6..f0feaeab8d 100755 --- a/apps/app_enumlookup.c +++ b/apps/app_enumlookup.c @@ -11,6 +11,16 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include static char *tdesc = "ENUM Lookup"; diff --git a/apps/app_eval.c b/apps/app_eval.c index 73b99c085f..c1f646b0fa 100755 --- a/apps/app_eval.c +++ b/apps/app_eval.c @@ -17,6 +17,11 @@ #include #include #include + +#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 d07b007091..49ce3e41d4 100755 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -17,6 +17,11 @@ #include #include #include + +#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 44dbd9ca45..cbe17866c5 100755 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -12,15 +12,6 @@ */ #include -#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 #include #include @@ -37,6 +28,19 @@ #include #include +#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 7514ef0bf7..dda5bcca65 100755 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -14,6 +14,17 @@ #include #include #include +#include +#ifdef __linux__ +#include +#else +#include +#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 -#ifdef __linux__ -#include -#else -#include -#endif /* __linux__ */ static char *tdesc = "Flash zap trunk application"; diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index a398333ce6..1452b0e4b0 100755 --- a/apps/app_forkcdr.c +++ b/apps/app_forkcdr.c @@ -9,16 +9,21 @@ * the GNU General Public License */ +#include +#include +#include +#include + +#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 -#include -#include -#include 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 2095498e69..1c0277489b 100755 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -11,6 +11,14 @@ * the GNU General Public License */ +#include +#include +#include + +#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 -#include -#include -#include static char *tdesc = "Get ADSI CPE ID"; diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c index d17521001d..d9a841f5d8 100755 --- a/apps/app_groupcount.c +++ b/apps/app_groupcount.c @@ -18,6 +18,10 @@ #include #include +#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 7dc3980a49..08bcc7ac7b 100755 --- a/apps/app_hasnewvoicemail.c +++ b/apps/app_hasnewvoicemail.c @@ -32,6 +32,15 @@ */ #include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include - -#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 6e1629d410..ae9e238696 100755 --- 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 #include #include @@ -27,8 +19,20 @@ #include #include #include + #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 44ed0b85a0..9c0d05c55f 100755 --- a/apps/app_image.c +++ b/apps/app_image.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Image Transmission Application"; diff --git a/apps/app_intercom.c b/apps/app_intercom.c index 53a6ec45d2..e1199979ad 100755 --- 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 #include #include @@ -35,6 +27,19 @@ #include #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 420225a32f..fb16d406b9 100755 --- a/apps/app_ivrdemo.c +++ b/apps/app_ivrdemo.c @@ -11,6 +11,14 @@ * the GNU General Public License */ +#include +#include +#include + +#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 -#include -#include static char *tdesc = "IVR Demo Application"; static char *app = "IVRDemo"; diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c index 42bc18e1a5..278f27452b 100755 --- a/apps/app_lookupblacklist.c +++ b/apps/app_lookupblacklist.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include 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 f41411ae04..beaf02aedb 100755 --- a/apps/app_lookupcidname.c +++ b/apps/app_lookupcidname.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Look up CallerID Name from local database"; diff --git a/apps/app_macro.c b/apps/app_macro.c index 43ad368366..25d2aa8642 100755 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -12,6 +12,14 @@ */ #include +#include +#include +#include + +#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 -#include -#include -#include #define MAX_ARGS 80 diff --git a/apps/app_math.c b/apps/app_math.c index 9d040ff5e7..fad0ad7e65 100755 --- a/apps/app_math.c +++ b/apps/app_math.c @@ -9,6 +9,24 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "asterisk/module.h" #include "asterisk/translate.h" -#include -#include -#include "asterisk.h" static char *tdesc = "Basic Math Functions"; diff --git a/apps/app_md5.c b/apps/app_md5.c index 369e683b2f..0e92c1c991 100755 --- a/apps/app_md5.c +++ b/apps/app_md5.c @@ -9,6 +9,14 @@ * the GNU General Public License */ +#include +#include +#include + +#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 -#include -#include 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 c7b1c920d9..ab33c05900 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -11,6 +11,22 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include +#include +#ifdef __linux__ +#include +#else +#include +#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 -#include -#include -#include -#include -#include -#include "asterisk.h" - -#ifdef __linux__ -#include -#else -#include -#endif /* __linux__ */ static char *tdesc = "MeetMe conference bridge"; diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index 4f729cd9ff..d7e5c0e5fa 100755 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -11,17 +11,22 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include static char *tdesc = "Digital Milliwatt (mu-law) Test Application"; diff --git a/apps/app_mp3.c b/apps/app_mp3.c index 4a4bcf0b5a..1b21d333fc 100755 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -11,6 +11,18 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include -#include -#include #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 13f3e7ae90..aa5e44d8ec 100755 --- 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 #include #include @@ -28,6 +20,19 @@ #include #include +#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 de08e44694..72eded69ec 100755 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -11,6 +11,15 @@ * the GNU General Public License */ +#include +#include +#include +#include + +#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 -#include -#include -#include -#include static char *tdesc = "OSP Lookup"; diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c index 0c8e71945a..37227b8fdb 100755 --- a/apps/app_parkandannounce.c +++ b/apps/app_parkandannounce.c @@ -15,6 +15,14 @@ */ #include +#include +#include +#include + +#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 -#include -#include -#include - 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 26b204605d..7e7cabe5be 100755 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Sound File Playback Application"; diff --git a/apps/app_privacy.c b/apps/app_privacy.c index 7eab0dd392..cb2bb01f7e 100755 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include #define PRIV_CONFIG "privacy.conf" diff --git a/apps/app_queue.c b/apps/app_queue.c index 0e759aa24a..c4f2de1f98 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -39,6 +39,20 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include -#include -#include -#include -#include - -#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 d49af9fdd9..70f77998c7 100755 --- a/apps/app_random.c +++ b/apps/app_random.c @@ -11,17 +11,21 @@ * */ +#include +#include +#include +#include + +#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 -#include -#include -#include - static char *tdesc = "Random goto"; diff --git a/apps/app_read.c b/apps/app_read.c index 6f63d2dace..0f0ab3752e 100755 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Read Variable Application"; diff --git a/apps/app_readfile.c b/apps/app_readfile.c index 5e09efce42..733dd108ce 100755 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -16,6 +16,11 @@ #include #include #include + +#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 6ae64f5c4d..d4ded9c208 100755 --- a/apps/app_realtime.c +++ b/apps/app_realtime.c @@ -12,6 +12,14 @@ * the GNU General Public License */ +#include +#include +#include + +#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 -#include -#include #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 41088182d5..c5da8f9102 100755 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Trivial Record Application"; diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 44f6a802d5..f04ce56cc1 100755 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -154,6 +140,25 @@ enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM}; #include #include +#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 05b08597f8..a641779d42 100755 --- a/apps/app_sayunixtime.c +++ b/apps/app_sayunixtime.c @@ -15,6 +15,11 @@ #include #include #include + +#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 d74a8b4ad0..c707d82b62 100755 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Send DTMF digits Application"; diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c index 391b2b2a2d..3f935b8218 100755 --- a/apps/app_sendtext.c +++ b/apps/app_sendtext.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Send Text Applications"; diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index 86cf9bd031..68e9653bd9 100755 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *app2 = "SetCallerPres"; diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c index 7e820db12f..39c17de39b 100755 --- a/apps/app_setcdruserfield.c +++ b/apps/app_setcdruserfield.c @@ -12,6 +12,13 @@ */ #include +#include +#include + +#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 -#include static char *tdesc = "CDR user field apps"; diff --git a/apps/app_setcidname.c b/apps/app_setcidname.c index 9a8dc2baa9..20cb23e3f9 100755 --- a/apps/app_setcidname.c +++ b/apps/app_setcidname.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Set CallerID Name"; diff --git a/apps/app_setcidnum.c b/apps/app_setcidnum.c index 481c1dc5d7..5169979433 100755 --- a/apps/app_setcidnum.c +++ b/apps/app_setcidnum.c @@ -12,6 +12,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Set CallerID Number"; diff --git a/apps/app_setrdnis.c b/apps/app_setrdnis.c index 0192973cbc..542f039983 100755 --- a/apps/app_setrdnis.c +++ b/apps/app_setrdnis.c @@ -12,6 +12,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Set RDNIS Number"; diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c index 6a57c590ff..d9c6dc5f81 100755 --- a/apps/app_settransfercapability.c +++ b/apps/app_settransfercapability.c @@ -11,15 +11,19 @@ * the GNU General Public License */ +#include +#include + +#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 -#include -#include "asterisk/transcap.h" static char *app = "SetTransferCapability"; diff --git a/apps/app_skel.c b/apps/app_skel.c index f1910a573b..ecd54aea52 100755 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -11,6 +11,14 @@ * the GNU General Public License */ +#include +#include +#include + +#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 -#include -#include static char *tdesc = "Trivial skeleton Application"; static char *app = "skel"; diff --git a/apps/app_sms.c b/apps/app_sms.c index 93b7d15c2e..d677ffb244 100755 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -9,6 +9,19 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/logger.h" @@ -18,16 +31,6 @@ #include "asterisk/module.h" #include "asterisk/alaw.h" #include "asterisk/callerid.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "asterisk.h" /* output using Alaw rather than linear */ /* #define OUTALAW */ diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c index 124f270c6c..14b711d5b6 100755 --- a/apps/app_softhangup.c +++ b/apps/app_softhangup.c @@ -12,16 +12,20 @@ */ #include +#include +#include +#include + +#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 -#include -#include -#include static char *synopsis = "Soft Hangup Application"; diff --git a/apps/app_sql_postgres.c b/apps/app_sql_postgres.c index 3185dad505..e891cd3c7f 100755 --- a/apps/app_sql_postgres.c +++ b/apps/app_sql_postgres.c @@ -11,6 +11,17 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include -#include -#include + #include "libpq-fe.h" #define EXTRA_LOG 0 diff --git a/apps/app_striplsd.c b/apps/app_striplsd.c index cc23309ab3..0e94e56c64 100755 --- a/apps/app_striplsd.c +++ b/apps/app_striplsd.c @@ -11,17 +11,21 @@ * the GNU General Public License */ +#include +#include +#include #include + +#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 -#include -#include -#include static char *tdesc = "Strip trailing digits"; diff --git a/apps/app_substring.c b/apps/app_substring.c index 5f0609ef55..a92f375738 100755 --- a/apps/app_substring.c +++ b/apps/app_substring.c @@ -12,6 +12,15 @@ */ #include +#include +#include +#include +#include + +#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 -#include -#include -#include static char *tdesc = "(Deprecated) Save substring digits in a given variable"; diff --git a/apps/app_system.c b/apps/app_system.c index ace3073330..d1ec12082d 100755 --- a/apps/app_system.c +++ b/apps/app_system.c @@ -11,6 +11,16 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include static char *tdesc = "Generic System() application"; diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c index 4d4d2662d3..52aaa78398 100755 --- a/apps/app_talkdetect.c +++ b/apps/app_talkdetect.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Playback with Talk Detection"; diff --git a/apps/app_test.c b/apps/app_test.c index 2d9a075a24..bbb54c192e 100755 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -14,6 +14,15 @@ #include #include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include "asterisk.h" - static char *tdesc = "Interface Test Application"; diff --git a/apps/app_transfer.c b/apps/app_transfer.c index 517a2c4b97..c56385beb6 100755 --- a/apps/app_transfer.c +++ b/apps/app_transfer.c @@ -11,16 +11,20 @@ * the GNU General Public License */ +#include +#include +#include + +#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 -#include -#include -#include static char *tdesc = "Transfer"; diff --git a/apps/app_txtcidname.c b/apps/app_txtcidname.c index dc39106de5..e357e9a3b2 100755 --- a/apps/app_txtcidname.c +++ b/apps/app_txtcidname.c @@ -11,6 +11,16 @@ * the GNU General Public License */ +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include static char *tdesc = "TXTCIDName"; diff --git a/apps/app_url.c b/apps/app_url.c index df63a0803d..4066b8dfd6 100755 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Send URL Applications"; diff --git a/apps/app_userevent.c b/apps/app_userevent.c index 71890be733..6830750f55 100755 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -8,6 +8,15 @@ * the GNU General Public License */ +#include +#include +#include +#include + +#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 -#include -#include -#include static char *tdesc = "Custom User Event Application"; diff --git a/apps/app_verbose.c b/apps/app_verbose.c index 5d767b9b0b..2ab50b6358 100755 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -15,6 +15,11 @@ #include #include #include + +#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 57f06e1dfe..084dc61e1d 100755 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "asterisk.h" #define COMMAND_TIMEOUT 5000 diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c index 93dec96d70..038defd66e 100755 --- a/apps/app_waitforring.c +++ b/apps/app_waitforring.c @@ -11,7 +11,16 @@ * the GNU General Public License */ +#include +#include +#include +#include #include + +#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 -#include -#include -#include static char *synopsis = "Wait for Ring Application"; diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c index b1294c1791..3272017996 100755 --- a/apps/app_waitforsilence.c +++ b/apps/app_waitforsilence.c @@ -17,6 +17,15 @@ * the GNU General Public License */ +#include +#include +#include +#include + +#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 -#include -#include -#include static char *tdesc = "Wait For Silence"; static char *app = "WaitForSilence"; diff --git a/apps/app_while.c b/apps/app_while.c index 71e821adc1..5eb5999ad1 100755 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include +#include + +#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 -#include -#include #define ALL_DONE(u,ret) {LOCAL_USER_REMOVE(u); return ret;} diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c index 38ec03fe59..53c79ca8e8 100755 --- a/apps/app_zapateller.c +++ b/apps/app_zapateller.c @@ -11,6 +11,13 @@ * the GNU General Public License */ +#include +#include + +#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 -#include static char *tdesc = "Block Telemarketers with Special Information Tone"; diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index dc02f8a12f..88b2466181 100755 --- 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 #include #include @@ -39,6 +27,23 @@ #include #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 517bbb50ec..69900ea442 100755 --- 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 #include #ifdef __linux__ @@ -41,6 +34,18 @@ #include #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 9b153ed26d..a6480cb9a0 100755 --- 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 #include #include @@ -41,6 +29,23 @@ #include #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 19534eaed3..52992fc7cf 100755 --- 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(®exbuf, iterator->file, 0, NULL, 0)) continue; ast_cli(fd, FORMAT, iterator->file, iterator->version); + + if (havename) + break; } AST_LIST_UNLOCK(&file_versions);