[Asterisk-cvs] asterisk/apps app_adsiprog.c, 1.15,
1.16 app_alarmreceiver.c, 1.15, 1.16 app_authenticate.c, 1.15,
1.16 app_cdr.c, 1.7, 1.8 app_chanisavail.c, 1.22,
1.23 app_chanspy.c, 1.25, 1.26 app_controlplayback.c, 1.13,
1.14 app_curl.c, 1.11, 1.12 app_cut.c, 1.14,
1.15 app_datetime.c, 1.5, 1.6 app_db.c, 1.13, 1.14 app_dial.c,
1.170, 1.171 app_dictate.c, 1.5, 1.6 app_directed_pickup.c,
1.3, 1.4 app_directory.c, 1.45, 1.46 app_disa.c, 1.34,
1.35 app_dumpchan.c, 1.10, 1.11 app_echo.c, 1.13,
1.14 app_enumlookup.c, 1.21, 1.22 app_eval.c, 1.7,
1.8 app_exec.c, 1.7, 1.8 app_externalivr.c, 1.9,
1.10 app_festival.c, 1.33, 1.34 app_flash.c, 1.7,
1.8 app_forkcdr.c, 1.12, 1.13 app_getcpeid.c, 1.9,
1.10 app_groupcount.c, 1.21, 1.22 app_hasnewvoicemail.c, 1.17,
1.18 app_ices.c, 1.8, 1.9 app_image.c, 1.8, 1.9 app_intercom.c,
1.23, 1.24 app_ivrdemo.c, 1.8, 1.9 app_lookupblacklist.c, 1.11,
1.12 app_lookupcidname.c, 1.9, 1.10 app_macro.c, 1.28,
1.29 app_math.c, 1.13, 1.14 app_md5.c, 1.8, 1.9 app_meetme.c,
1.112, 1.113 app_milliwatt.c, 1.12, 1.13 app_mp3.c, 1.27,
1.28 app_muxmon.c, 1.2, 1.3 app_nbscat.c, 1.12,
1.13 app_osplookup.c, 1.10, 1.11 app_page.c, 1.5,
1.6 app_parkandannounce.c, 1.16, 1.17 app_playback.c, 1.20,
1.21 app_privacy.c, 1.17, 1.18 app_queue.c, 1.170,
1.171 app_random.c, 1.8, 1.9 app_read.c, 1.22,
1.23 app_readfile.c, 1.8, 1.9 app_realtime.c, 1.12,
1.13 app_record.c, 1.37, 1.38 app_sayunixtime.c, 1.12,
1.13 app_senddtmf.c, 1.11, 1.12 app_sendtext.c, 1.9,
1.10 app_setcallerid.c, 1.10, 1.11 app_setcdruserfield.c, 1.9,
1.10 app_setcidname.c, 1.11, 1.12 app_setcidnum.c, 1.12,
1.13 app_setrdnis.c, 1.7, 1.8 app_settransfercapability.c, 1.7,
1.8 app_skel.c, 1.13, 1.14 app_sms.c, 1.27,
1.28 app_softhangup.c, 1.9, 1.10 app_sql_postgres.c, 1.13,
1.14 app_striplsd.c, 1.7, 1.8 app_substring.c, 1.12,
1.13 app_system.c, 1.18, 1.19 app_talkdetect.c, 1.13,
1.14 app_test.c, 1.12, 1.13 app_transfer.c, 1.14,
1.15 app_txtcidname.c, 1.18, 1.19 app_url.c, 1.11,
1.12 app_userevent.c, 1.7, 1.8 app_verbose.c, 1.6,
1.7 app_voicemail.c, 1.251, 1.252 app_waitforring.c, 1.7,
1.8 app_waitforsilence.c, 1.9, 1.10 app_while.c, 1.10,
1.11 app_zapateller.c, 1.10, 1.11 app_zapbarge.c, 1.10,
1.11 app_zapras.c, 1.13, 1.14 app_zapscan.c, 1.21, 1.22
russell
russell
Tue Oct 18 18:58:30 CDT 2005
Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv8991/apps
Modified Files:
app_adsiprog.c app_alarmreceiver.c app_authenticate.c
app_cdr.c app_chanisavail.c app_chanspy.c
app_controlplayback.c app_curl.c app_cut.c app_datetime.c
app_db.c app_dial.c app_dictate.c app_directed_pickup.c
app_directory.c app_disa.c app_dumpchan.c app_echo.c
app_enumlookup.c app_eval.c app_exec.c app_externalivr.c
app_festival.c app_flash.c app_forkcdr.c app_getcpeid.c
app_groupcount.c app_hasnewvoicemail.c app_ices.c app_image.c
app_intercom.c app_ivrdemo.c app_lookupblacklist.c
app_lookupcidname.c app_macro.c app_math.c app_md5.c
app_meetme.c app_milliwatt.c app_mp3.c app_muxmon.c
app_nbscat.c app_osplookup.c app_page.c app_parkandannounce.c
app_playback.c app_privacy.c app_queue.c app_random.c
app_read.c app_readfile.c app_realtime.c app_record.c
app_sayunixtime.c app_senddtmf.c app_sendtext.c
app_setcallerid.c app_setcdruserfield.c app_setcidname.c
app_setcidnum.c app_setrdnis.c app_settransfercapability.c
app_skel.c app_sms.c app_softhangup.c app_sql_postgres.c
app_striplsd.c app_substring.c app_system.c app_talkdetect.c
app_test.c app_transfer.c app_txtcidname.c app_url.c
app_userevent.c app_verbose.c app_voicemail.c
app_waitforring.c app_waitforsilence.c app_while.c
app_zapateller.c app_zapbarge.c app_zapras.c app_zapscan.c
Log Message:
it's a good idea to unregister everything before calling STANDARD_HANGUP_LOCALUSERS
Index: app_adsiprog.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_adsiprog.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- app_adsiprog.c 14 Sep 2005 20:46:49 -0000 1.15
+++ app_adsiprog.c 18 Oct 2005 22:52:21 -0000 1.16
@@ -1570,8 +1570,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_alarmreceiver.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_alarmreceiver.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- app_alarmreceiver.c 15 Sep 2005 15:44:26 -0000 1.15
+++ app_alarmreceiver.c 18 Oct 2005 22:52:21 -0000 1.16
@@ -829,8 +829,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_authenticate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_authenticate.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- app_authenticate.c 14 Sep 2005 20:46:49 -0000 1.15
+++ app_authenticate.c 18 Oct 2005 22:52:21 -0000 1.16
@@ -199,8 +199,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_cdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_cdr.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_cdr.c 14 Sep 2005 20:46:49 -0000 1.7
+++ app_cdr.c 18 Oct 2005 22:52:21 -0000 1.8
@@ -55,8 +55,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(nocdr_app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(nocdr_app);
+
+ return res;
}
int load_module(void)
Index: app_chanisavail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_chanisavail.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- app_chanisavail.c 18 Oct 2005 03:29:12 -0000 1.22
+++ app_chanisavail.c 18 Oct 2005 22:52:21 -0000 1.23
@@ -148,8 +148,13 @@
int unload_module(void)
{
+ int res = 0;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_chanspy.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_chanspy.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- app_chanspy.c 13 Oct 2005 23:15:30 -0000 1.25
+++ app_chanspy.c 18 Oct 2005 22:52:21 -0000 1.26
@@ -709,8 +709,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_controlplayback.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_controlplayback.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- app_controlplayback.c 14 Sep 2005 20:46:49 -0000 1.13
+++ app_controlplayback.c 18 Oct 2005 22:52:21 -0000 1.14
@@ -132,9 +132,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+ return res;
}
int load_module(void)
Index: app_curl.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_curl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- app_curl.c 25 Sep 2005 19:36:48 -0000 1.11
+++ app_curl.c 18 Oct 2005 22:52:21 -0000 1.12
@@ -204,22 +204,31 @@
.synopsis = "Retrieves the contents of a URL",
.syntax = "CURL(url[|post-data])",
.desc =
-" url - URL to retrieve\n"
-" post-data - Optional data to send as a POST (GET is default action)\n",
+ " url - URL to retrieve\n"
+ " post-data - Optional data to send as a POST (GET is default action)\n",
.read = acf_curl_exec,
};
int unload_module(void)
{
+ int res;
+
+ res = ast_custom_function_unregister(&acf_curl);
+ res |= ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_custom_function_unregister(&acf_curl);
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
{
- ast_custom_function_register(&acf_curl);
- return ast_register_application(app, curl_exec, synopsis, descrip);
+ int res;
+
+ res = ast_custom_function_register(&acf_curl);
+ res |= ast_register_application(app, curl_exec, synopsis, descrip);
+
+ return res;
}
char *description(void)
Index: app_cut.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_cut.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- app_cut.c 18 Oct 2005 16:48:19 -0000 1.14
+++ app_cut.c 18 Oct 2005 22:52:21 -0000 1.15
@@ -427,19 +427,28 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_custom_function_unregister(&acf_cut);
+ res |= ast_custom_function_unregister(&acf_sort);
+ res |= ast_unregister_application(app_sort);
+ res |= ast_unregister_application(app_cut);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_custom_function_unregister(&acf_cut);
- ast_custom_function_unregister(&acf_sort);
- ast_unregister_application(app_sort);
- return ast_unregister_application(app_cut);
+
+ return res;
}
int load_module(void)
{
- ast_custom_function_register(&acf_cut);
- ast_custom_function_register(&acf_sort);
- ast_register_application(app_sort, sort_exec, app_sort_synopsis, app_sort_descrip);
- return ast_register_application(app_cut, cut_exec, cut_synopsis, cut_descrip);
+ int res;
+
+ res = ast_custom_function_register(&acf_cut);
+ res |= ast_custom_function_register(&acf_sort);
+ res |= ast_register_application(app_sort, sort_exec, app_sort_synopsis, app_sort_descrip);
+ res |= ast_register_application(app_cut, cut_exec, cut_synopsis, cut_descrip);
+
+ return res;
}
char *description(void)
Index: app_datetime.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_datetime.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- app_datetime.c 14 Sep 2005 20:46:49 -0000 1.5
+++ app_datetime.c 18 Oct 2005 22:52:21 -0000 1.6
@@ -69,8 +69,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_db.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_db.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- app_db.c 14 Sep 2005 20:46:49 -0000 1.13
+++ app_db.c 18 Oct 2005 22:52:21 -0000 1.14
@@ -241,12 +241,13 @@
{
int retval;
- STANDARD_HANGUP_LOCALUSERS;
retval = ast_unregister_application(dt_app);
retval |= ast_unregister_application(d_app);
retval |= ast_unregister_application(p_app);
retval |= ast_unregister_application(g_app);
+ STANDARD_HANGUP_LOCALUSERS;
+
return retval;
}
Index: app_dial.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- app_dial.c 14 Oct 2005 00:11:50 -0000 1.170
+++ app_dial.c 18 Oct 2005 22:52:21 -0000 1.171
@@ -1791,16 +1791,23 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+ res |= ast_unregister_application(rapp);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_unregister_application(app);
- return ast_unregister_application(rapp);
+
+ return res;
}
int load_module(void)
{
int res;
- if (!(res = ast_register_application(app, dial_exec, synopsis, descrip)))
- res = ast_register_application(rapp, retrydial_exec, rsynopsis, rdescrip);
+
+ res = ast_register_application(app, dial_exec, synopsis, descrip);
+ res |= ast_register_application(rapp, retrydial_exec, rsynopsis, rdescrip);
+
return res;
}
Index: app_dictate.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dictate.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- app_dictate.c 15 Sep 2005 15:44:26 -0000 1.5
+++ app_dictate.c 18 Oct 2005 22:52:21 -0000 1.6
@@ -322,8 +322,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_directed_pickup.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_directed_pickup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- app_directed_pickup.c 11 Oct 2005 21:08:26 -0000 1.3
+++ app_directed_pickup.c 18 Oct 2005 22:52:21 -0000 1.4
@@ -129,9 +129,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+ return res;
}
int load_module(void)
Index: app_directory.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_directory.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- app_directory.c 4 Oct 2005 22:44:15 -0000 1.45
+++ app_directory.c 18 Oct 2005 22:52:21 -0000 1.46
@@ -476,8 +476,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_disa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_disa.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- app_disa.c 13 Oct 2005 23:52:42 -0000 1.34
+++ app_disa.c 18 Oct 2005 22:52:21 -0000 1.35
@@ -379,8 +379,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_dumpchan.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dumpchan.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- app_dumpchan.c 14 Sep 2005 20:46:49 -0000 1.10
+++ app_dumpchan.c 18 Oct 2005 22:52:21 -0000 1.11
@@ -155,8 +155,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_echo.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_echo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- app_echo.c 14 Sep 2005 20:46:49 -0000 1.13
+++ app_echo.c 18 Oct 2005 22:52:21 -0000 1.14
@@ -88,8 +88,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_enumlookup.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_enumlookup.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- app_enumlookup.c 26 Sep 2005 20:53:33 -0000 1.21
+++ app_enumlookup.c 18 Oct 2005 22:52:21 -0000 1.22
@@ -194,27 +194,32 @@
/*--- unload_module: Unload this application from PBX */
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
/*--- load_module: Load this application into PBX */
int load_module(void)
{
int res;
+
res = ast_register_application(app, enumlookup_exec, synopsis, descrip);
- if (res)
- return(res);
- if ((res=load_config())) {
- return(res);
- }
- return(0);
+
+ if (!res)
+ res = load_config();
+
+ return res;
}
/*--- reload: Reload configuration file */
int reload(void)
{
- return(load_config());
+ return load_config();
}
Index: app_eval.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_eval.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_eval.c 15 Sep 2005 15:44:26 -0000 1.7
+++ app_eval.c 18 Oct 2005 22:52:21 -0000 1.8
@@ -93,8 +93,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app_eval);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app_eval);
+
+ return res;
}
int load_module(void)
Index: app_exec.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_exec.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_exec.c 15 Sep 2005 15:44:26 -0000 1.7
+++ app_exec.c 18 Oct 2005 22:52:21 -0000 1.8
@@ -100,8 +100,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app_exec);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app_exec);
+
+ return res;
}
int load_module(void)
Index: app_externalivr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_externalivr.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- app_externalivr.c 14 Sep 2005 20:46:49 -0000 1.9
+++ app_externalivr.c 18 Oct 2005 22:52:21 -0000 1.10
@@ -545,9 +545,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+ return res;
}
int load_module(void)
Index: app_festival.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_festival.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- app_festival.c 15 Sep 2005 15:44:26 -0000 1.33
+++ app_festival.c 18 Oct 2005 22:52:21 -0000 1.34
@@ -470,8 +470,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_flash.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_flash.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_flash.c 14 Sep 2005 20:46:49 -0000 1.7
+++ app_flash.c 18 Oct 2005 22:52:21 -0000 1.8
@@ -108,8 +108,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_forkcdr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_forkcdr.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_forkcdr.c 15 Sep 2005 15:44:26 -0000 1.12
+++ app_forkcdr.c 18 Oct 2005 22:52:21 -0000 1.13
@@ -85,8 +85,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_getcpeid.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_getcpeid.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- app_getcpeid.c 14 Sep 2005 20:46:49 -0000 1.9
+++ app_getcpeid.c 18 Oct 2005 22:52:21 -0000 1.10
@@ -134,8 +134,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_groupcount.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_groupcount.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- app_groupcount.c 14 Sep 2005 20:46:49 -0000 1.21
+++ app_groupcount.c 18 Oct 2005 22:52:21 -0000 1.22
@@ -267,23 +267,28 @@
int unload_module(void)
{
int res;
- STANDARD_HANGUP_LOCALUSERS;
- ast_cli_unregister(&cli_show_channels);
- res = ast_unregister_application(app_group_count);
+
+ res = ast_cli_unregister(&cli_show_channels);
+ res |= ast_unregister_application(app_group_count);
res |= ast_unregister_application(app_group_set);
res |= ast_unregister_application(app_group_check);
res |= ast_unregister_application(app_group_match_count);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
return res;
}
int load_module(void)
{
int res;
+
res = ast_register_application(app_group_count, group_count_exec, group_count_synopsis, group_count_descrip);
res |= ast_register_application(app_group_set, group_set_exec, group_set_synopsis, group_set_descrip);
res |= ast_register_application(app_group_check, group_check_exec, group_check_synopsis, group_check_descrip);
res |= ast_register_application(app_group_match_count, group_match_count_exec, group_match_count_synopsis, group_match_count_descrip);
- ast_cli_register(&cli_show_channels);
+ res |= ast_cli_register(&cli_show_channels);
+
return res;
}
Index: app_hasnewvoicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_hasnewvoicemail.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- app_hasnewvoicemail.c 5 Oct 2005 01:37:48 -0000 1.17
+++ app_hasnewvoicemail.c 18 Oct 2005 22:52:21 -0000 1.18
@@ -189,27 +189,32 @@
.synopsis = "Counts the voicemail in a specified mailbox",
.syntax = "VMCOUNT(vmbox[@context][|folder])",
.desc =
-" context - defaults to \"default\"\n"
-" folder - defaults to \"INBOX\"\n",
+ " context - defaults to \"default\"\n"
+ " folder - defaults to \"INBOX\"\n",
.read = acf_vmcount_exec,
};
int unload_module(void)
{
int res;
- STANDARD_HANGUP_LOCALUSERS;
+
res = ast_custom_function_unregister(&acf_vmcount);
res |= ast_unregister_application(app_hasvoicemail);
res |= ast_unregister_application(app_hasnewvoicemail);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
return res;
}
int load_module(void)
{
int res;
+
res = ast_custom_function_register(&acf_vmcount);
res |= ast_register_application(app_hasvoicemail, hasvoicemail_exec, hasvoicemail_synopsis, hasvoicemail_descrip);
res |= ast_register_application(app_hasnewvoicemail, hasvoicemail_exec, hasnewvoicemail_synopsis, hasnewvoicemail_descrip);
+
return res;
}
Index: app_ices.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_ices.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_ices.c 14 Sep 2005 20:46:49 -0000 1.8
+++ app_ices.c 18 Oct 2005 22:52:21 -0000 1.9
@@ -184,8 +184,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_image.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_image.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_image.c 14 Sep 2005 20:46:49 -0000 1.8
+++ app_image.c 18 Oct 2005 22:52:21 -0000 1.9
@@ -60,26 +60,38 @@
{
int res = 0;
struct localuser *u;
+
+ LOCAL_USER_ADD(u);
+
if (!data || !strlen((char *)data)) {
ast_log(LOG_WARNING, "SendImage requires an argument (filename)\n");
+ LOCAL_USER_REMOVE(u);
return -1;
}
- LOCAL_USER_ADD(u);
+
if (!ast_supports_images(chan)) {
/* Does not support transport */
- if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
- chan->priority += 100;
+ ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);
+ LOCAL_USER_REMOVE(u);
return 0;
}
+
res = ast_send_image(chan, data);
+
LOCAL_USER_REMOVE(u);
+
return res;
}
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_intercom.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_intercom.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- app_intercom.c 14 Sep 2005 20:46:49 -0000 1.23
+++ app_intercom.c 18 Oct 2005 22:52:21 -0000 1.24
@@ -192,10 +192,16 @@
int unload_module(void)
{
- STANDARD_HANGUP_LOCALUSERS;
+ int res;
+
if (sound > -1)
close(sound);
- return ast_unregister_application(app);
+
+ res = ast_unregister_application(app);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
+ return res;
}
int load_module(void)
Index: app_ivrdemo.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_ivrdemo.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_ivrdemo.c 14 Sep 2005 20:46:49 -0000 1.8
+++ app_ivrdemo.c 18 Oct 2005 22:52:21 -0000 1.9
@@ -104,8 +104,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_lookupblacklist.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_lookupblacklist.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- app_lookupblacklist.c 14 Sep 2005 20:46:49 -0000 1.11
+++ app_lookupblacklist.c 18 Oct 2005 22:52:21 -0000 1.12
@@ -96,8 +96,13 @@
int unload_module (void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application (app);
+
+ return res;
}
int load_module (void)
Index: app_lookupcidname.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_lookupcidname.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- app_lookupcidname.c 14 Sep 2005 20:46:49 -0000 1.9
+++ app_lookupcidname.c 18 Oct 2005 22:52:21 -0000 1.10
@@ -81,8 +81,13 @@
int
unload_module (void)
{
- STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application (app);
+ int res;
+
+ res = ast_unregister_application (app);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
+ return res;
}
int
Index: app_macro.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_macro.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- app_macro.c 14 Sep 2005 20:46:49 -0000 1.28
+++ app_macro.c 18 Oct 2005 22:52:21 -0000 1.29
@@ -333,17 +333,26 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(if_app);
+ res |= ast_unregister_application(exit_app);
+ res |= ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_unregister_application(if_app);
- ast_unregister_application(exit_app);
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
{
- ast_register_application(exit_app, macro_exit_exec, exit_synopsis, exit_descrip);
- ast_register_application(if_app, macroif_exec, if_synopsis, if_descrip);
- return ast_register_application(app, macro_exec, synopsis, descrip);
+ int res;
+
+ res = ast_register_application(exit_app, macro_exit_exec, exit_synopsis, exit_descrip);
+ res |= ast_register_application(if_app, macroif_exec, if_synopsis, if_descrip);
+ res |= ast_register_application(app, macro_exec, synopsis, descrip);
+
+ return res;
}
char *description(void)
Index: app_math.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_math.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- app_math.c 14 Sep 2005 20:46:49 -0000 1.13
+++ app_math.c 18 Oct 2005 22:52:21 -0000 1.14
@@ -258,17 +258,17 @@
int unload_module(void)
{
int res;
+
+ res = ast_unregister_application(app_math);
+
STANDARD_HANGUP_LOCALUSERS;
- res = ast_unregister_application(app_math);
return res;
}
int load_module(void)
{
- int res;
- res = ast_register_application(app_math, math_exec, math_synopsis, math_descrip);
- return res;
+ return ast_register_application(app_math, math_exec, math_synopsis, math_descrip);
}
char *description(void)
Index: app_md5.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_md5.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_md5.c 14 Sep 2005 20:46:49 -0000 1.8
+++ app_md5.c 18 Oct 2005 22:52:21 -0000 1.9
@@ -141,9 +141,11 @@
{
int res;
- STANDARD_HANGUP_LOCALUSERS;
- res =ast_unregister_application(app_md5);
+ res = ast_unregister_application(app_md5);
res |= ast_unregister_application(app_md5check);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
return res;
}
@@ -153,6 +155,7 @@
res = ast_register_application(app_md5check, md5check_exec, desc_md5check, synopsis_md5check);
res |= ast_register_application(app_md5, md5_exec, desc_md5, synopsis_md5);
+
return res;
}
Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- app_meetme.c 5 Oct 2005 00:28:04 -0000 1.112
+++ app_meetme.c 18 Oct 2005 22:52:21 -0000 1.113
@@ -2106,23 +2106,31 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_cli_unregister(&cli_show_confs);
+ res |= ast_cli_unregister(&cli_conf);
+ res |= ast_unregister_application(app3);
+ res |= ast_unregister_application(app2);
+ res |= ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_cli_unregister(&cli_show_confs);
- ast_cli_unregister(&cli_conf);
- ast_unregister_application(app3);
- ast_unregister_application(app2);
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
{
- ast_cli_register(&cli_show_confs);
- ast_cli_register(&cli_conf);
- ast_register_application(app3, admin_exec, synopsis3, descrip3);
- ast_register_application(app2, count_exec, synopsis2, descrip2);
- return ast_register_application(app, conf_exec, synopsis, descrip);
-}
+ int res;
+ res = ast_cli_register(&cli_show_confs);
+ res |= ast_cli_register(&cli_conf);
+ res |= ast_register_application(app3, admin_exec, synopsis3, descrip3);
+ res |= ast_register_application(app2, count_exec, synopsis2, descrip2);
+ res |= ast_register_application(app, conf_exec, synopsis, descrip);
+
+ return res;
+}
char *description(void)
{
Index: app_milliwatt.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_milliwatt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_milliwatt.c 14 Sep 2005 20:46:49 -0000 1.12
+++ app_milliwatt.c 18 Oct 2005 22:52:21 -0000 1.13
@@ -137,8 +137,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_mp3.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_mp3.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- app_mp3.c 14 Sep 2005 20:46:49 -0000 1.27
+++ app_mp3.c 18 Oct 2005 22:52:21 -0000 1.28
@@ -218,8 +218,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_muxmon.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_muxmon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- app_muxmon.c 16 Oct 2005 23:26:35 -0000 1.2
+++ app_muxmon.c 18 Oct 2005 22:52:21 -0000 1.3
@@ -495,15 +495,24 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_cli_unregister(&cli_muxmon);
+ res |= ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_cli_unregister(&cli_muxmon);
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
{
- ast_cli_register(&cli_muxmon);
- return ast_register_application(app, muxmon_exec, synopsis, desc);
+ int res;
+
+ res = ast_cli_register(&cli_muxmon);
+ res |= ast_register_application(app, muxmon_exec, synopsis, desc);
+
+ return res;
}
char *description(void)
Index: app_nbscat.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_nbscat.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_nbscat.c 14 Sep 2005 20:46:49 -0000 1.12
+++ app_nbscat.c 18 Oct 2005 22:52:21 -0000 1.13
@@ -201,8 +201,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_osplookup.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_osplookup.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- app_osplookup.c 14 Sep 2005 20:46:49 -0000 1.10
+++ app_osplookup.c 18 Oct 2005 22:52:21 -0000 1.11
@@ -243,26 +243,25 @@
int unload_module(void)
{
int res;
- STANDARD_HANGUP_LOCALUSERS;
+
res = ast_unregister_application(app3);
res |= ast_unregister_application(app2);
res |= ast_unregister_application(app);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
return res;
}
int load_module(void)
{
int res;
+
res = ast_register_application(app, osplookup_exec, synopsis, descrip);
- if (res)
- return(res);
- res = ast_register_application(app2, ospnext_exec, synopsis2, descrip2);
- if (res)
- return(res);
- res = ast_register_application(app3, ospfinished_exec, synopsis3, descrip3);
- if (res)
- return(res);
- return(0);
+ res |= ast_register_application(app2, ospnext_exec, synopsis2, descrip2);
+ res |= ast_register_application(app3, ospfinished_exec, synopsis3, descrip3);
+
+ return res;
}
int reload(void)
Index: app_page.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_page.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- app_page.c 18 Oct 2005 17:44:52 -0000 1.5
+++ app_page.c 18 Oct 2005 22:52:21 -0000 1.6
@@ -170,9 +170,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app_page);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app_page);
+ return res;
}
int load_module(void)
Index: app_parkandannounce.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_parkandannounce.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- app_parkandannounce.c 14 Sep 2005 20:46:49 -0000 1.16
+++ app_parkandannounce.c 18 Oct 2005 22:52:21 -0000 1.17
@@ -238,8 +238,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_playback.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_playback.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- app_playback.c 14 Sep 2005 20:46:49 -0000 1.20
+++ app_playback.c 18 Oct 2005 22:52:21 -0000 1.21
@@ -116,8 +116,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_privacy.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_privacy.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- app_privacy.c 14 Sep 2005 20:46:49 -0000 1.17
+++ app_privacy.c 18 Oct 2005 22:52:21 -0000 1.18
@@ -169,8 +169,13 @@
int
unload_module (void)
{
- STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application (app);
+ int res;
+
+ res = ast_unregister_application (app);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
+ return res;
}
int
Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- app_queue.c 18 Oct 2005 20:58:16 -0000 1.170
+++ app_queue.c 18 Oct 2005 22:52:21 -0000 1.171
@@ -3693,50 +3693,56 @@
int unload_module(void)
{
- STANDARD_HANGUP_LOCALUSERS;
- ast_cli_unregister(&cli_show_queue);
- ast_cli_unregister(&cli_show_queues);
- ast_cli_unregister(&cli_add_queue_member);
- ast_cli_unregister(&cli_remove_queue_member);
- ast_manager_unregister("Queues");
- ast_manager_unregister("QueueStatus");
- ast_manager_unregister("QueueAdd");
- ast_manager_unregister("QueueRemove");
- ast_manager_unregister("QueuePause");
+ int res;
+
+ res = ast_cli_unregister(&cli_show_queue);
+ res |= ast_cli_unregister(&cli_show_queues);
+ res |= ast_cli_unregister(&cli_add_queue_member);
+ res |= ast_cli_unregister(&cli_remove_queue_member);
+ res |= ast_manager_unregister("Queues");
+ res |= ast_manager_unregister("QueueStatus");
+ res |= ast_manager_unregister("QueueAdd");
+ res |= ast_manager_unregister("QueueRemove");
+ res |= ast_manager_unregister("QueuePause");
ast_devstate_del(statechange_queue, NULL);
- ast_unregister_application(app_aqm);
- ast_unregister_application(app_rqm);
- ast_unregister_application(app_pqm);
- ast_unregister_application(app_upqm);
- ast_custom_function_unregister(&queueagentcount_function);
- return ast_unregister_application(app);
+ res |= ast_unregister_application(app_aqm);
+ res |= ast_unregister_application(app_rqm);
+ res |= ast_unregister_application(app_pqm);
+ res |= ast_unregister_application(app_upqm);
+ res |= ast_custom_function_unregister(&queueagentcount_function);
+ res |= ast_unregister_application(app);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
+ return res;
}
int load_module(void)
{
int res;
+
res = ast_register_application(app, queue_exec, synopsis, descrip);
- if (!res) {
- ast_cli_register(&cli_show_queue);
- ast_cli_register(&cli_show_queues);
- ast_cli_register(&cli_add_queue_member);
- ast_cli_register(&cli_remove_queue_member);
- ast_devstate_add(statechange_queue, NULL);
- ast_manager_register( "Queues", 0, manager_queues_show, "Queues" );
- ast_manager_register( "QueueStatus", 0, manager_queues_status, "Queue Status" );
- ast_manager_register( "QueueAdd", EVENT_FLAG_AGENT, manager_add_queue_member, "Add interface to queue." );
- ast_manager_register( "QueueRemove", EVENT_FLAG_AGENT, manager_remove_queue_member, "Remove interface from queue." );
- ast_manager_register( "QueuePause", EVENT_FLAG_AGENT, manager_pause_queue_member, "Makes a queue member temporarily unavailable" );
- ast_register_application(app_aqm, aqm_exec, app_aqm_synopsis, app_aqm_descrip) ;
- ast_register_application(app_rqm, rqm_exec, app_rqm_synopsis, app_rqm_descrip) ;
- ast_register_application(app_pqm, pqm_exec, app_pqm_synopsis, app_pqm_descrip) ;
- ast_register_application(app_upqm, upqm_exec, app_upqm_synopsis, app_upqm_descrip) ;
- ast_custom_function_register(&queueagentcount_function);
+ res |= ast_cli_register(&cli_show_queue);
+ res |= ast_cli_register(&cli_show_queues);
+ res |= ast_cli_register(&cli_add_queue_member);
+ res |= ast_cli_register(&cli_remove_queue_member);
+ res |= ast_devstate_add(statechange_queue, NULL);
+ res |= ast_manager_register( "Queues", 0, manager_queues_show, "Queues" );
+ res |= ast_manager_register( "QueueStatus", 0, manager_queues_status, "Queue Status" );
+ res |= ast_manager_register( "QueueAdd", EVENT_FLAG_AGENT, manager_add_queue_member, "Add interface to queue." );
+ res |= ast_manager_register( "QueueRemove", EVENT_FLAG_AGENT, manager_remove_queue_member, "Remove interface from queue." );
+ res |= ast_manager_register( "QueuePause", EVENT_FLAG_AGENT, manager_pause_queue_member, "Makes a queue member temporarily unavailable" );
+ res |= ast_register_application(app_aqm, aqm_exec, app_aqm_synopsis, app_aqm_descrip) ;
+ res |= ast_register_application(app_rqm, rqm_exec, app_rqm_synopsis, app_rqm_descrip) ;
+ res |= ast_register_application(app_pqm, pqm_exec, app_pqm_synopsis, app_pqm_descrip) ;
+ res |= ast_register_application(app_upqm, upqm_exec, app_upqm_synopsis, app_upqm_descrip) ;
+ res |= ast_custom_function_register(&queueagentcount_function);
+
+ if (!res) {
+ reload_queues();
+ if (queue_persistent_members)
+ reload_queue_members();
}
- reload_queues();
-
- if (queue_persistent_members)
- reload_queue_members();
return res;
}
Index: app_random.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_random.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_random.c 15 Sep 2005 15:44:26 -0000 1.8
+++ app_random.c 18 Oct 2005 22:52:21 -0000 1.9
@@ -85,8 +85,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app_random);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app_random);
+
+ return res;
}
int load_module(void)
Index: app_read.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_read.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- app_read.c 14 Sep 2005 20:46:49 -0000 1.22
+++ app_read.c 18 Oct 2005 22:52:21 -0000 1.23
@@ -188,8 +188,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_readfile.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_readfile.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_readfile.c 14 Sep 2005 20:46:49 -0000 1.8
+++ app_readfile.c 18 Oct 2005 22:52:21 -0000 1.9
@@ -104,8 +104,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app_readfile);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app_readfile);
+
+ return res;
}
int load_module(void)
Index: app_realtime.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_realtime.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_realtime.c 14 Sep 2005 20:46:49 -0000 1.12
+++ app_realtime.c 18 Oct 2005 22:52:21 -0000 1.13
@@ -212,19 +212,28 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_cli_unregister(&cli_load_realtime_cmd);
+ res |= ast_cli_unregister(&cli_update_realtime_cmd);
+ res |= ast_unregister_application(uapp);
+ res |= ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_cli_unregister(&cli_load_realtime_cmd);
- ast_cli_unregister(&cli_update_realtime_cmd);
- ast_unregister_application(uapp);
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
{
- ast_cli_register(&cli_load_realtime_cmd);
- ast_cli_register(&cli_update_realtime_cmd);
- ast_register_application(uapp, realtime_update_exec, usynopsis, udesc);
- return ast_register_application(app, realtime_exec, synopsis, desc);
+ int res;
+
+ res = ast_cli_register(&cli_load_realtime_cmd);
+ res |= ast_cli_register(&cli_update_realtime_cmd);
+ res |= ast_register_application(uapp, realtime_update_exec, usynopsis, udesc);
+ res |= ast_register_application(app, realtime_exec, synopsis, desc);
+
+ return res;
}
char *description(void)
Index: app_record.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_record.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- app_record.c 15 Sep 2005 01:17:51 -0000 1.37
+++ app_record.c 18 Oct 2005 22:52:21 -0000 1.38
@@ -321,8 +321,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_sayunixtime.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_sayunixtime.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_sayunixtime.c 15 Sep 2005 15:44:26 -0000 1.12
+++ app_sayunixtime.c 18 Oct 2005 22:52:21 -0000 1.13
@@ -127,22 +127,23 @@
int unload_module(void)
{
int res;
- STANDARD_HANGUP_LOCALUSERS;
+
res = ast_unregister_application(app_sayunixtime);
- if (! res)
- return ast_unregister_application(app_datetime);
- else
- return res;
+ res |= ast_unregister_application(app_datetime);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
+ return res;
}
int load_module(void)
{
int res;
+
res = ast_register_application(app_sayunixtime, sayunixtime_exec, sayunixtime_synopsis, sayunixtime_descrip);
- if (! res)
- return ast_register_application(app_datetime, sayunixtime_exec, sayunixtime_synopsis, datetime_descrip);
- else
- return res;
+ res |= ast_register_application(app_datetime, sayunixtime_exec, sayunixtime_synopsis, datetime_descrip);
+
+ return res;
}
char *description(void)
Index: app_senddtmf.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_senddtmf.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- app_senddtmf.c 14 Sep 2005 20:46:49 -0000 1.11
+++ app_senddtmf.c 18 Oct 2005 22:52:21 -0000 1.12
@@ -82,8 +82,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_sendtext.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_sendtext.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- app_sendtext.c 14 Sep 2005 20:46:49 -0000 1.9
+++ app_sendtext.c 18 Oct 2005 22:52:21 -0000 1.10
@@ -98,9 +98,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+ return res;
}
int load_module(void)
Index: app_setcallerid.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_setcallerid.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- app_setcallerid.c 14 Sep 2005 20:46:49 -0000 1.10
+++ app_setcallerid.c 18 Oct 2005 22:52:21 -0000 1.11
@@ -121,15 +121,24 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app2);
+ res |= ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_unregister_application(app2);
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
{
- ast_register_application(app2, setcallerid_pres_exec, synopsis2, descrip2);
- return ast_register_application(app, setcallerid_exec, synopsis, descrip);
+ int res;
+
+ res = ast_register_application(app2, setcallerid_pres_exec, synopsis2, descrip2);
+ res |= ast_register_application(app, setcallerid_exec, synopsis, descrip);
+
+ return res;
}
char *description(void)
Index: app_setcdruserfield.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_setcdruserfield.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- app_setcdruserfield.c 14 Sep 2005 20:46:49 -0000 1.9
+++ app_setcdruserfield.c 18 Oct 2005 22:52:21 -0000 1.10
@@ -141,19 +141,24 @@
int unload_module(void)
{
int res;
- STANDARD_HANGUP_LOCALUSERS;
+
res = ast_unregister_application(setcdruserfield_app);
res |= ast_unregister_application(appendcdruserfield_app);
- ast_manager_unregister("SetCDRUserField");
+ res |= ast_manager_unregister("SetCDRUserField");
+
+ STANDARD_HANGUP_LOCALUSERS;
+
return res;
}
int load_module(void)
{
int res;
+
res = ast_register_application(setcdruserfield_app, setcdruserfield_exec, setcdruserfield_synopsis, setcdruserfield_descrip);
res |= ast_register_application(appendcdruserfield_app, appendcdruserfield_exec, appendcdruserfield_synopsis, appendcdruserfield_descrip);
- ast_manager_register("SetCDRUserField", EVENT_FLAG_CALL, action_setcdruserfield, "Set the CDR UserField");
+ res |= ast_manager_register("SetCDRUserField", EVENT_FLAG_CALL, action_setcdruserfield, "Set the CDR UserField");
+
return res;
}
Index: app_setcidname.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_setcidname.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- app_setcidname.c 14 Sep 2005 20:46:49 -0000 1.11
+++ app_setcidname.c 18 Oct 2005 22:52:21 -0000 1.12
@@ -85,8 +85,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_setcidnum.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_setcidnum.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_setcidnum.c 14 Sep 2005 20:46:49 -0000 1.12
+++ app_setcidnum.c 18 Oct 2005 22:52:21 -0000 1.13
@@ -90,8 +90,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_setrdnis.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_setrdnis.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_setrdnis.c 14 Sep 2005 20:46:49 -0000 1.7
+++ app_setrdnis.c 18 Oct 2005 22:52:21 -0000 1.8
@@ -93,8 +93,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_settransfercapability.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_settransfercapability.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_settransfercapability.c 14 Sep 2005 20:46:49 -0000 1.7
+++ app_settransfercapability.c 18 Oct 2005 22:52:21 -0000 1.8
@@ -103,8 +103,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_skel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_skel.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- app_skel.c 14 Sep 2005 20:46:49 -0000 1.13
+++ app_skel.c 18 Oct 2005 22:52:21 -0000 1.14
@@ -108,8 +108,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_sms.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_sms.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- app_sms.c 14 Sep 2005 20:46:49 -0000 1.27
+++ app_sms.c 18 Oct 2005 22:52:21 -0000 1.28
@@ -1507,8 +1507,13 @@
int unload_module (void)
{
+ int res;
+
+ res = ast_unregister_application (app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application (app);
+
+ return res;
}
int load_module (void)
Index: app_softhangup.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_softhangup.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- app_softhangup.c 14 Sep 2005 20:46:49 -0000 1.9
+++ app_softhangup.c 18 Oct 2005 22:52:21 -0000 1.10
@@ -102,8 +102,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_sql_postgres.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_sql_postgres.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- app_sql_postgres.c 14 Sep 2005 20:46:49 -0000 1.13
+++ app_sql_postgres.c 18 Oct 2005 22:52:21 -0000 1.14
@@ -546,8 +546,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_striplsd.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_striplsd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_striplsd.c 14 Sep 2005 20:46:49 -0000 1.7
+++ app_striplsd.c 18 Oct 2005 22:52:21 -0000 1.8
@@ -85,8 +85,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_substring.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_substring.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_substring.c 14 Sep 2005 20:46:49 -0000 1.12
+++ app_substring.c 18 Oct 2005 22:52:21 -0000 1.13
@@ -123,8 +123,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_system.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_system.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- app_system.c 13 Oct 2005 22:43:46 -0000 1.18
+++ app_system.c 18 Oct 2005 22:52:21 -0000 1.19
@@ -135,15 +135,24 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+ res |= ast_unregister_application(app2);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_unregister_application(app2);
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
{
- ast_register_application(app2, trysystem_exec, synopsis2, descrip2);
- return ast_register_application(app, system_exec, synopsis, descrip);
+ int res;
+
+ res = ast_register_application(app2, trysystem_exec, synopsis2, descrip2);
+ res |= ast_register_application(app, system_exec, synopsis, descrip);
+
+ return res;
}
char *description(void)
Index: app_talkdetect.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_talkdetect.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- app_talkdetect.c 14 Sep 2005 20:46:49 -0000 1.13
+++ app_talkdetect.c 18 Oct 2005 22:52:21 -0000 1.14
@@ -208,8 +208,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_test.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- app_test.c 14 Sep 2005 20:46:49 -0000 1.12
+++ app_test.c 18 Oct 2005 22:52:21 -0000 1.13
@@ -488,15 +488,24 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(testc_app);
+ res |= ast_unregister_application(tests_app);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_unregister_application(testc_app);
- return ast_unregister_application(tests_app);
+
+ return res;
}
int load_module(void)
{
- ast_register_application(testc_app, testclient_exec, testc_synopsis, testc_descrip);
- return ast_register_application(tests_app, testserver_exec, tests_synopsis, tests_descrip);
+ int res;
+
+ res = ast_register_application(testc_app, testclient_exec, testc_synopsis, testc_descrip);
+ res |= ast_register_application(tests_app, testserver_exec, tests_synopsis, tests_descrip);
+
+ return res;
}
char *description(void)
Index: app_transfer.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_transfer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- app_transfer.c 14 Sep 2005 20:46:49 -0000 1.14
+++ app_transfer.c 18 Oct 2005 22:52:21 -0000 1.15
@@ -120,9 +120,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+ return res;
}
int load_module(void)
Index: app_txtcidname.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_txtcidname.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- app_txtcidname.c 18 Oct 2005 03:02:06 -0000 1.18
+++ app_txtcidname.c 18 Oct 2005 22:52:21 -0000 1.19
@@ -96,17 +96,18 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
{
- int res;
-
- res = ast_register_application(app, txtcidname_exec, synopsis, descrip);
-
- return res;
+ return ast_register_application(app, txtcidname_exec, synopsis, descrip);
}
char *description(void)
Index: app_url.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_url.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- app_url.c 14 Sep 2005 20:46:49 -0000 1.11
+++ app_url.c 18 Oct 2005 22:52:21 -0000 1.12
@@ -154,8 +154,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_userevent.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_userevent.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_userevent.c 15 Sep 2005 15:44:26 -0000 1.7
+++ app_userevent.c 18 Oct 2005 22:52:21 -0000 1.8
@@ -97,8 +97,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_verbose.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_verbose.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- app_verbose.c 15 Sep 2005 15:44:26 -0000 1.6
+++ app_verbose.c 18 Oct 2005 22:52:21 -0000 1.7
@@ -98,8 +98,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app_verbose);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app_verbose);
+
+ return res;
}
int load_module(void)
Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- app_voicemail.c 14 Oct 2005 00:08:24 -0000 1.251
+++ app_voicemail.c 18 Oct 2005 22:52:21 -0000 1.252
@@ -6212,14 +6212,17 @@
int unload_module(void)
{
int res;
- STANDARD_HANGUP_LOCALUSERS;
+
res = ast_unregister_application(app);
res |= ast_unregister_application(app2);
res |= ast_unregister_application(app3);
res |= ast_unregister_application(app4);
- ast_cli_unregister(&show_voicemail_users_cli);
- ast_cli_unregister(&show_voicemail_zones_cli);
+ res |= ast_cli_unregister(&show_voicemail_users_cli);
+ res |= ast_cli_unregister(&show_voicemail_zones_cli);
ast_uninstall_vm_functions();
+
+ STANDARD_HANGUP_LOCALUSERS;
+
return res;
}
Index: app_waitforring.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_waitforring.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- app_waitforring.c 14 Sep 2005 20:46:49 -0000 1.7
+++ app_waitforring.c 18 Oct 2005 22:52:21 -0000 1.8
@@ -118,8 +118,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_waitforsilence.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_waitforsilence.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- app_waitforsilence.c 14 Sep 2005 20:46:49 -0000 1.9
+++ app_waitforsilence.c 18 Oct 2005 22:52:21 -0000 1.10
@@ -174,8 +174,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_while.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_while.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- app_while.c 14 Sep 2005 20:46:49 -0000 1.10
+++ app_while.c 18 Oct 2005 22:52:21 -0000 1.11
@@ -319,17 +319,26 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(start_app);
+ res |= ast_unregister_application(exec_app);
+ res |= ast_unregister_application(stop_app);
+
STANDARD_HANGUP_LOCALUSERS;
- ast_unregister_application(start_app);
- ast_unregister_application(exec_app);
- return ast_unregister_application(stop_app);
+
+ return res;
}
int load_module(void)
{
- ast_register_application(start_app, while_start_exec, start_synopsis, start_desc);
- ast_register_application(exec_app, execif_exec, exec_synopsis, exec_desc);
- return ast_register_application(stop_app, while_end_exec, stop_synopsis, stop_desc);
+ int res;
+
+ res = ast_register_application(start_app, while_start_exec, start_synopsis, start_desc);
+ res |= ast_register_application(exec_app, execif_exec, exec_synopsis, exec_desc);
+ res |= ast_register_application(stop_app, while_end_exec, stop_synopsis, stop_desc);
+
+ return res;
}
char *description(void)
Index: app_zapateller.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_zapateller.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- app_zapateller.c 14 Sep 2005 20:46:49 -0000 1.10
+++ app_zapateller.c 18 Oct 2005 22:52:21 -0000 1.11
@@ -104,8 +104,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_zapbarge.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_zapbarge.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- app_zapbarge.c 14 Sep 2005 20:46:49 -0000 1.10
+++ app_zapbarge.c 18 Oct 2005 22:52:21 -0000 1.11
@@ -299,8 +299,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_zapras.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_zapras.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- app_zapras.c 14 Sep 2005 20:46:49 -0000 1.13
+++ app_zapras.c 18 Oct 2005 22:52:21 -0000 1.14
@@ -235,8 +235,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
Index: app_zapscan.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_zapscan.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- app_zapscan.c 14 Sep 2005 20:46:49 -0000 1.21
+++ app_zapscan.c 18 Oct 2005 22:52:21 -0000 1.22
@@ -364,8 +364,13 @@
int unload_module(void)
{
+ int res;
+
+ res = ast_unregister_application(app);
+
STANDARD_HANGUP_LOCALUSERS;
- return ast_unregister_application(app);
+
+ return res;
}
int load_module(void)
More information about the svn-commits
mailing list