Merged revisions 317967 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317967 | russell | 2011-05-06 16:38:54 -0500 (Fri, 06 May 2011) | 2 lines

  Fix some more "set but unused" compiler warnings.
........

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 73d9716..9b3ee97 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2246,7 +2246,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
        int talkreq_manager = 0;
        int using_pseudo = 0;
        int duration = 20;
-       int hr, min, sec;
        int sent_event = 0;
        int checked = 0;
        int announcement_played = 0;
@@ -3808,9 +3807,6 @@ bailoutandtrynormal:
        if (user->user_no) {
                /* Only cleanup users who really joined! */
                now = ast_tvnow();
-               hr = (now.tv_sec - user->jointime) / 3600;
-               min = ((now.tv_sec - user->jointime) % 3600) / 60;
-               sec = (now.tv_sec - user->jointime) % 60;
 
                if (sent_event) {
                        ast_manager_event(chan, EVENT_FLAG_CALL, "MeetmeLeave",
@@ -6459,7 +6455,6 @@ static int sla_trunk_exec(struct ast_channel *chan, const char *data)
                AST_APP_ARG(options);
        );
        char *opts[SLA_TRUNK_OPT_ARG_ARRAY_SIZE] = { NULL, };
-       char *conf_opt_args[OPT_ARG_ARRAY_SIZE] = { NULL, };
        struct ast_flags opt_flags = { 0 };
        char *parse;
 
@@ -6522,7 +6517,6 @@ static int sla_trunk_exec(struct ast_channel *chan, const char *data)
        if (ast_test_flag(&opt_flags, SLA_TRUNK_OPT_MOH)) {
                ast_indicate(chan, -1);
                ast_set_flag64(&conf_flags, CONFFLAG_MOH);
-               conf_opt_args[OPT_ARG_MOH_CLASS] = opts[SLA_TRUNK_OPT_ARG_MOH_CLASS];
        } else
                ast_indicate(chan, AST_CONTROL_RINGING);