aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-08 13:17:42 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-08 13:17:42 +0000
commitade2d912ec854e65e98e0f4316714a90f7433d10 (patch)
treea6d6897de47b58ccfe16f44ee647aca866457749
parenta726040c2b25df110a9a64c6ed22f4c3c1214b59 (diff)
fix a compiler warning, and overwriting 'res' value
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@58352 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_meetme.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index aee0eb9a6..ba5fb22eb 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4693,22 +4693,22 @@ static int unload_module(void)
static int load_module(void)
{
- int res;
+ int res = 0;
res |= load_config(0);
ast_cli_register_multiple(cli_meetme, ARRAY_LEN(cli_meetme));
- res = ast_manager_register("MeetmeMute", EVENT_FLAG_CALL,
- action_meetmemute, "Mute a Meetme user");
+ res |= ast_manager_register("MeetmeMute", EVENT_FLAG_CALL,
+ action_meetmemute, "Mute a Meetme user");
res |= ast_manager_register("MeetmeUnmute", EVENT_FLAG_CALL,
- action_meetmeunmute, "Unmute a Meetme user");
+ action_meetmeunmute, "Unmute a Meetme user");
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);
res |= ast_register_application(slastation_app, sla_station_exec,
- slastation_synopsis, slastation_desc);
+ slastation_synopsis, slastation_desc);
res |= ast_register_application(slatrunk_app, sla_trunk_exec,
- slatrunk_synopsis, slatrunk_desc);
+ slatrunk_synopsis, slatrunk_desc);
res |= ast_devstate_prov_add("Meetme", meetmestate);
res |= ast_devstate_prov_add("SLA", sla_state);