diff options
Diffstat (limited to 'apps')
73 files changed, 0 insertions, 155 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 0f3b157c3..f884e8cc1 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -61,8 +61,6 @@ static char *descrip = " ADSIProg(script): This application programs an ADSI Phone with the given\n" "script. If nothing is specified, the default script (asterisk.adsi) is used.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; struct adsi_event { diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index e7310ef23..517f57f6f 100644 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -95,16 +95,10 @@ static char event_app[128] = {'\0'}; static char db_family[128] = {'\0'}; static char time_stamp_format[128] = {"%a %b %d, %Y @ %H:%M:%S %Z"}; - /* Misc variables */ - static char event_file[14] = "/event-XXXXXX"; - - -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; /* diff --git a/apps/app_amd.c b/apps/app_amd.c index bcbacb55f..e32b1ea54 100644 --- a/apps/app_amd.c +++ b/apps/app_amd.c @@ -70,8 +70,6 @@ static char *descrip = " LONGGREETING-<%d voiceDuration>-<%d greeting>\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; #define STATE_IN_WORD 1 diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c index 3dd27fe11..89087a477 100644 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -92,8 +92,6 @@ static char *descrip = " Defaults to 0 - no limit - wait for the user press the '#' key.\n" ; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int auth_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_cdr.c b/apps/app_cdr.c index 3a457e60b..663a1722e 100644 --- a/apps/app_cdr.c +++ b/apps/app_cdr.c @@ -46,8 +46,6 @@ static char *nocdr_descrip = static char *nocdr_app = "NoCDR"; static char *nocdr_synopsis = "Tell Asterisk to not maintain a CDR for the current call"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int nocdr_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c index 399ae428d..03d119d6e 100644 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -65,8 +65,6 @@ static char *descrip = " s - Consider the channel unavailable if the channel is in use at all\n" " j - Support jumping to priority n+101 if no channel is available\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int chanavail_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 1d828d59b..88637f7be 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -107,7 +107,6 @@ AST_APP_OPTIONS(chanspy_opts, { AST_APP_OPTION_ARG('r', OPTION_RECORD, OPT_ARG_RECORD), }); -STANDARD_LOCAL_USER; LOCAL_USER_DECL; struct chanspy_translation_helper { diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c index ceb345cd5..7d24eb9d9 100644 --- a/apps/app_controlplayback.c +++ b/apps/app_controlplayback.c @@ -68,8 +68,6 @@ static const char *descrip = " CPLAYBACKSTATUS - This variable contains the status of the attempt as a text\n" " string, one of: SUCCESS | USERSTOPPED | ERROR\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int is_on_phonepad(char key) diff --git a/apps/app_curl.c b/apps/app_curl.c index 0432854a5..7c42d701a 100644 --- a/apps/app_curl.c +++ b/apps/app_curl.c @@ -50,8 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static char *tdesc = "Load external URL"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; struct MemoryStruct { diff --git a/apps/app_db.c b/apps/app_db.c index 3eafca591..665d96a1a 100644 --- a/apps/app_db.c +++ b/apps/app_db.c @@ -64,8 +64,6 @@ static char *dt_app = "DBdeltree"; static char *d_synopsis = "Delete a key from the database"; static char *dt_synopsis = "Delete a family or keytree from the database"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int deltree_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_dial.c b/apps/app_dial.c index cfe25b81b..20726e134 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -271,7 +271,6 @@ struct dial_localuser { }; LOCAL_USER_DECL; -STANDARD_LOCAL_USER; static void hanguptree(struct dial_localuser *outgoing, struct ast_channel *exception) { diff --git a/apps/app_dictate.c b/apps/app_dictate.c index 20fec3c98..e27ce7900 100644 --- a/apps/app_dictate.c +++ b/apps/app_dictate.c @@ -52,8 +52,6 @@ static char *synopsis = "Virtual Dictation Machine"; static char *desc = " Dictate([<base_dir>[|<filename>]])\n" "Start dictation machine using optional base dir for files.\n"; - -STANDARD_LOCAL_USER; LOCAL_USER_DECL; typedef enum { diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index 45f3f4a89..3255ade9f 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -50,8 +50,6 @@ static const char *descrip = "that is calling the specified extension. If no context is specified, the current\n" "context will be used.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int pickup_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_directory.c b/apps/app_directory.c index d32250187..1935a0ca8 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -76,8 +76,6 @@ static char *descrip = /* How many digits to read in */ #define NUMDIGITS 3 -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static char *convert(char *lastname) diff --git a/apps/app_disa.c b/apps/app_disa.c index 1c8cb6732..12c34ff2f 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -97,8 +97,6 @@ static char *descrip = "exists in the context, it will be used. Also, if you set the 5th argument\n" "to 'NOANSWER', the DISA application will not answer initially.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static void play_dialtone(struct ast_channel *chan, char *mailbox) diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c index fbb2d82a4..115f149c4 100644 --- a/apps/app_dumpchan.c +++ b/apps/app_dumpchan.c @@ -56,8 +56,6 @@ static char *desc = "displayed when the verbose level is currently set to that number\n" "or greater. \n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int ast_serialize_showchan(struct ast_channel *c, char *buf, size_t size) diff --git a/apps/app_echo.c b/apps/app_echo.c index c6dc8e54c..61a126108 100644 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -52,8 +52,6 @@ static char *descrip = "the calling channel back to itself. If the DTMF digit '#' is received, the\n" "application will exit.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int echo_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_exec.c b/apps/app_exec.c index 9f8390d5c..3b1f30a4f 100644 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -56,8 +56,6 @@ static char *exec_descrip = "see the application System. Returns whatever value the\n" "app returns or a non-zero value if the app cannot be found.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int exec_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index 0e7cd0f37..2f62e51d5 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -85,7 +85,6 @@ struct ivr_localuser { }; LOCAL_USER_DECL; -STANDARD_LOCAL_USER; struct gen_state { struct ivr_localuser *u; diff --git a/apps/app_festival.c b/apps/app_festival.c index e00fce618..a42037041 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -69,8 +69,6 @@ static char *descrip = "play it to the user, allowing any given interrupt keys to immediately terminate and return\n" "the value, or 'any' to allow any number back (useful in dialplan)\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static char *socket_receive_file_to_buff(int fd,int *size) diff --git a/apps/app_flash.c b/apps/app_flash.c index 84ed38934..07cff8bce 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -61,8 +61,6 @@ static char *descrip = "people who want to perform transfers and such via AGI and is generally\n" "quite useless oths application will only work on Zap trunks.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static inline int zt_wait_event(int fd) diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index 9b29df765..1dcec262a 100644 --- a/apps/app_forkcdr.c +++ b/apps/app_forkcdr.c @@ -52,9 +52,6 @@ static char *descrip = "If the option 'v' is passed all cdr variables will be passed along also.\n" ""; - -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static void ast_cdr_fork(struct ast_channel *chan) diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index b88104ee5..1e06fae6e 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -53,8 +53,6 @@ static char *descrip = " GetCPEID: Obtains and displays ADSI CPE ID and other information in order\n" "to properly setup zapata.conf for on-hook operations.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int cpeid_setstatus(struct ast_channel *chan, char *stuff[], int voice) diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c index f34e60372..2bbe2f996 100644 --- a/apps/app_hasnewvoicemail.c +++ b/apps/app_hasnewvoicemail.c @@ -78,8 +78,6 @@ static char *hasnewvoicemail_descrip = " HASVMSTATUS The result of the new voicemail check returned as a text string as follows\n" " <# of messages in the folder, 0 for NONE>\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int hasvoicemail_internal(char *context, char *box, char *folder) diff --git a/apps/app_ices.c b/apps/app_ices.c index a8527b309..7062eea26 100644 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -61,8 +61,6 @@ static char *descrip = "(available separately). A configuration file must be supplied\n" "for ices (see examples/asterisk-ices.conf). \n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int icesencode(char *filename, int fd) diff --git a/apps/app_image.c b/apps/app_image.c index 75cb34653..b1d3dee8c 100644 --- a/apps/app_image.c +++ b/apps/app_image.c @@ -61,8 +61,6 @@ static char *descrip = " SENDIMAGESTATUS The status is the result of the attempt as a text string, one of\n" " OK | NOSUPPORT \n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int sendimage_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c index 8c5b308bf..dff1220db 100644 --- a/apps/app_ivrdemo.c +++ b/apps/app_ivrdemo.c @@ -84,8 +84,6 @@ AST_IVR_DECLARE_MENU(ivr_demo, "IVR Demo Main Menu", 0, { NULL }, }); -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int skel_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c index ec88931c6..da8019389 100644 --- a/apps/app_lookupblacklist.c +++ b/apps/app_lookupblacklist.c @@ -63,8 +63,6 @@ static char *descrip = " FOUND | NOTFOUND\n" "Example: exten => 1234,1,LookupBlacklist()\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c index 90341a424..dfdea495a 100644 --- a/apps/app_lookupcidname.c +++ b/apps/app_lookupcidname.c @@ -59,8 +59,6 @@ static char *descrip = "name delivery, or if you want to change the names on some incoming\n" "calls.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int diff --git a/apps/app_macro.c b/apps/app_macro.c index 922fc23ed..42c6cf658 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -85,8 +85,6 @@ static char *synopsis = "Macro Implementation"; static char *if_synopsis = "Conditional Macro Implementation"; static char *exit_synopsis = "Exit From Macro"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int macro_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 0b56add34..efe057228 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -132,8 +132,6 @@ static const char *descrip3 = #define CONFIG_FILE_NAME "meetme.conf" -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; struct ast_conference { diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index ac2c51e33..69fc3887f 100644 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -52,8 +52,6 @@ static char *synopsis = "Generate a Constant 1000Hz tone at 0dbm (mu-law)"; static char *descrip = "Milliwatt(): Generate a Constant 1000Hz tone at 0dbm (mu-law)\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static char digital_milliwatt[] = {0x1e,0x0b,0x0b,0x1e,0x9e,0x8b,0x8b,0x9e} ; diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index acc882502..9febe75b9 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -80,8 +80,6 @@ static const char *desc = "" "The variable MIXMONITOR_FILENAME will contain the filename used to record.\n" ""; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static const char *mixmonitor_spy_type = "MixMonitor"; diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c index 8aae89e77..64bac4a96 100644 --- a/apps/app_morsecode.c +++ b/apps/app_morsecode.c @@ -54,8 +54,6 @@ static char *morsecode_descrip = "(defaults to 80). Additionally, if MORSETONE is set, it will use that tone\n" "(in Hz). The tone default is 800.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static char *morsecode[] = { diff --git a/apps/app_mp3.c b/apps/app_mp3.c index 943163c5e..9bd5004b3 100644 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -60,8 +60,6 @@ static char *descrip = "which typically would be a filename or a URL. User can exit by pressing\n" "any key on the dialpad, or by hanging up."; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int mp3play(char *filename, int fd) diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c index f41fc04f5..5380d3091 100644 --- a/apps/app_nbscat.c +++ b/apps/app_nbscat.c @@ -64,8 +64,6 @@ static char *descrip = " NBScat: Executes nbscat to listen to the local NBS stream.\n" "User can exit by pressing any key\n."; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int NBScatplay(int fd) diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index e9b916c6d..266c66dda 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -96,8 +96,6 @@ static char *descrip3 = " OSPFINISHSTATUS The status of the OSP Finish attempt as a text string, one of\n" " SUCCESS | FAILED \n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int str2cause(char *cause) diff --git a/apps/app_page.c b/apps/app_page.c index cc10700bc..d848fb875 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -60,8 +60,6 @@ static const char *page_descrip = " d - full duplex audio\n" " q - quiet, do not play beep to caller\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; enum { diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c index b8481b23d..8382f76d5 100644 --- a/apps/app_parkandannounce.c +++ b/apps/app_parkandannounce.c @@ -75,9 +75,6 @@ static char *descrip = "call was placed. Use with the Local channel to allow the dialplan to make\n" "use of this information.\n"; - -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int parkandannounce_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_playback.c b/apps/app_playback.c index 2023308ba..89d8f9877 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -66,8 +66,6 @@ static char *descrip = " SUCCESS | FAILED\n" ; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int playback_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_privacy.c b/apps/app_privacy.c index 2503b82f3..35502009a 100644 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -76,12 +76,8 @@ static char *descrip = " SUCCESS | FAILED \n" ; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; - - static int privacy_exec (struct ast_channel *chan, void *data) { int res=0; diff --git a/apps/app_queue.c b/apps/app_queue.c index 9d1548617..158fc7825 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -272,8 +272,6 @@ struct callattempt { struct member *member; }; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; struct queue_ent { diff --git a/apps/app_random.c b/apps/app_random.c index 6cd17dd78..a7ff1f3a0 100644 --- a/apps/app_random.c +++ b/apps/app_random.c @@ -52,8 +52,6 @@ static char *random_descrip = " probability := INTEGER in the range 1 to 100\n" "DEPRECATED: Use GotoIf($[${RAND(1,100)} > <number>]?<label>)\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int random_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_read.c b/apps/app_read.c index 461ad995e..889fc9d31 100644 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -82,8 +82,6 @@ static char *descrip = " timeout -- if greater than 0, that value will override the default timeout.\n\n" "Read should disconnect if the function fails or errors out.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; #define ast_next_data(instr,ptr,delim) if((ptr=strchr(instr,delim))) { *(ptr) = '\0' ; ptr++;} diff --git a/apps/app_readfile.c b/apps/app_readfile.c index f842663ee..4b3f57e94 100644 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -54,11 +54,8 @@ static char *readfile_descrip = " File - The name of the file to read.\n" " Length - Maximum number of characters to capture.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; - static int readfile_exec(struct ast_channel *chan, void *data) { int res=0; diff --git a/apps/app_realtime.c b/apps/app_realtime.c index 9e83d2638..fb0ff0c03 100644 --- a/apps/app_realtime.c +++ b/apps/app_realtime.c @@ -69,7 +69,6 @@ static char *udesc = "Use the RealTime config handler system to update a value\n "updated to <newval>. REALTIMECOUNT will be set with the number of rows\n" "updated or -1 if an error occurs.\n"; -STANDARD_LOCAL_USER; LOCAL_USER_DECL; static int cli_load_realtime(int fd, int argc, char **argv) diff --git a/apps/app_record.c b/apps/app_record.c index f594947bd..07167278c 100644 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -72,8 +72,6 @@ static char *descrip = "If the user should hangup during a recording, all data will be lost and the\n" "application will teminate. \n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int record_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 9deba11c1..af3e93533 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -256,7 +256,6 @@ static char *remote_rig_rbi="rbi"; struct ast_config *cfg; -STANDARD_LOCAL_USER; LOCAL_USER_DECL; #define MSWAIT 200 diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c index 9e0a0747d..d3efc0101 100644 --- a/apps/app_sayunixtime.c +++ b/apps/app_sayunixtime.c @@ -67,8 +67,6 @@ static char *datetime_descrip = " format: a format the time is to be said in. See voicemail.conf.\n" " defaults to \"ABdY 'digits/at' IMp\"\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int sayunixtime_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c index b019c9601..8b0e90d2e 100644 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -56,8 +56,6 @@ static char *descrip = " The application will either pass the assigned digits or terminate if it\n" " encounters an error.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int senddtmf_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c index fea5ebaf9..9ed543591 100644 --- a/apps/app_sendtext.c +++ b/apps/app_sendtext.c @@ -65,8 +65,6 @@ static const char *descrip = "'j' -- jump to n+101 priority if the channel doesn't support\n" " text transport\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int sendtext_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index 7957b05e5..2238b33c3 100644 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -47,8 +47,6 @@ static char *app2 = "SetCallerPres"; static char *synopsis2 = "Set CallerID Presentation"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static char *descrip2 = diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c index 7085855d8..a8a31222e 100644 --- a/apps/app_setcdruserfield.c +++ b/apps/app_setcdruserfield.c @@ -74,8 +74,6 @@ static char *appendcdruserfield_descrip = static char *appendcdruserfield_app = "AppendCDRUserField"; static char *appendcdruserfield_synopsis = "Append to the CDR user field"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int action_setcdruserfield(struct mansession *s, struct message *m) diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c index 884c3d64b..cf9cee314 100644 --- a/apps/app_settransfercapability.c +++ b/apps/app_settransfercapability.c @@ -44,8 +44,6 @@ static char *app = "SetTransferCapability"; static char *synopsis = "Set ISDN Transfer Capability"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static struct { int val; char *name; } transcaps[] = { diff --git a/apps/app_skel.c b/apps/app_skel.c index 27c9a7a50..f982b6a2d 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -61,8 +61,6 @@ AST_DECLARE_OPTIONS(app_opts,{ ['c'] = { OPTION_C, 2 } }); -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int app_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_sms.c b/apps/app_sms.c index c80c0a1f4..eeb20b461 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -95,8 +95,6 @@ static signed short wave[] = { static unsigned char wavea[80]; #endif -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; /* SMS 7 bit character mapping to UCS-2 */ diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c index 374de0510..e95459143 100644 --- a/apps/app_softhangup.c +++ b/apps/app_softhangup.c @@ -54,8 +54,6 @@ static char *desc = " SoftHangup(Technology/resource|options)\n" static char *app = "SoftHangup"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int softhangup_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_stack.c b/apps/app_stack.c index 60aa22f03..50888a7d1 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -67,8 +67,6 @@ static const char *pop_descrip = "StackPop()\n" " Removes last label on the stack, discarding it.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int pop_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_system.c b/apps/app_system.c index 0619b5cf3..d139e6e6a 100644 --- a/apps/app_system.c +++ b/apps/app_system.c @@ -83,8 +83,6 @@ static char *descrip2 = "instance, then the channel will be setup to continue at that\n" "priority level. Otherwise, System will terminate.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int system_exec_helper(struct ast_channel *chan, void *data, int failmode) diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c index cd1e68049..4c65e75af 100644 --- a/apps/app_talkdetect.c +++ b/apps/app_talkdetect.c @@ -60,8 +60,6 @@ static char *descrip = "if available. If unspecified, sil, min, and max default to 1000, 100, and\n" "infinity respectively.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int background_detect_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_test.c b/apps/app_test.c index bc181f86e..8eb93996c 100644 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -48,8 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/pbx.h" #include "asterisk/utils.h" -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static char *tdesc = "Interface Test Application"; diff --git a/apps/app_transfer.c b/apps/app_transfer.c index 6b459353a..c9564dbf3 100644 --- a/apps/app_transfer.c +++ b/apps/app_transfer.c @@ -45,8 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/options.h" #include "asterisk/app.h" -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static const char *tdesc = "Transfer"; diff --git a/apps/app_url.c b/apps/app_url.c index 2b8dccff9..64aa59901 100644 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -70,8 +70,6 @@ static char *descrip = " SendURL only returns 0 if the URL was sent correctly or if\n" " the channel does not support HTML transport, and -1 otherwise.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int sendurl_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_userevent.c b/apps/app_userevent.c index a62c50b88..523d58277 100644 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -56,8 +56,6 @@ static char *descrip = "If the body is not specified, only Event, Channel, and Uniqueid fields\n" "will be present. Returns 0."; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int userevent_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_verbose.c b/apps/app_verbose.c index 72504c6fa..c1caf7f22 100644 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -54,8 +54,6 @@ static char *log_descrip = "Log(<level>|<message>)\n" " level must be one of ERROR, WARNING, NOTICE, DEBUG, VERBOSE, DTMF\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int verbose_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 13ad2f786..b031525fb 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -430,8 +430,6 @@ static unsigned char adsisec[4] = "\x9B\xDB\xF7\xAC"; static int adsiver = 1; static char emaildateformat[32] = "%A, %B %d, %Y at %r"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static void populate_defaults(struct ast_vm_user *vmu) diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c index 63fe9c043..8f56e41a9 100644 --- a/apps/app_waitforring.c +++ b/apps/app_waitforring.c @@ -54,8 +54,6 @@ static char *desc = " WaitForRing(timeout)\n" static char *app = "WaitForRing"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int waitforring_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c index 948c8c756..c874bf4a8 100644 --- a/apps/app_waitforsilence.c +++ b/apps/app_waitforsilence.c @@ -61,8 +61,6 @@ static char *descrip = " - WaitForSilence(500|2) will wait for 1/2 second of silence, twice\n" " - WaitForSilence(1000) will wait for 1 second of silence, once\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int do_waiting(struct ast_channel *chan, int maxsilence) { diff --git a/apps/app_while.c b/apps/app_while.c index cd7053b21..423858a8e 100644 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -73,10 +73,6 @@ static char *stop_synopsis = "End A While Loop"; static char *tdesc = "While Loops and Conditional Execution"; - - -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int execif_exec(struct ast_channel *chan, void *data) { diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c index 488bfa3b4..b229104d9 100644 --- a/apps/app_zapateller.c +++ b/apps/app_zapateller.c @@ -56,8 +56,6 @@ static char *descrip = "is no callerid information available. Options should be separated by |\n" "characters\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; static int zapateller_exec(struct ast_channel *chan, void *data) diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 7f28f0679..6e3ac754b 100644 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -73,12 +73,8 @@ static char *descrip = "-1 when caller user hangs up and is independent of the\n" "state of the channel being monitored."; - -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; - #define CONF_SIZE 160 static int careful_write(int fd, unsigned char *data, int len) diff --git a/apps/app_zapras.c b/apps/app_zapras.c index d6960ec17..c4f54b22a 100644 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -73,8 +73,6 @@ static char *descrip = "Your pppd must be patched to be zaptel aware. Arguments should be\n" "separated by | characters.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; #define PPP_MAX_ARGS 32 diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index 829e3b3c7..8dc6397ee 100644 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -71,11 +71,8 @@ static char *descrip = "a convenient way. Use '#' to select the next channel and use '*' to exit\n" "Limit scanning to a channel GROUP by setting the option group argument.\n"; -STANDARD_LOCAL_USER; - LOCAL_USER_DECL; - #define CONF_SIZE 160 static struct ast_channel *get_zap_channel_locked(int num) { |