Remove extraneous line variables.
authorDamien Wedhorn <voip@facts.com.au>
Tue, 17 May 2011 21:59:55 +0000 (21:59 +0000)
committerDamien Wedhorn <voip@facts.com.au>
Tue, 17 May 2011 21:59:55 +0000 (21:59 +0000)
The vars were either explicitly or implicitly not used.

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

channels/chan_skinny.c

index be9668e..b90ba7e 100644 (file)
@@ -1244,7 +1244,6 @@ struct skinny_subchannel {
        char mohinterpret[MAX_MUSICCLASS];              \
        char mohsuggest[MAX_MUSICCLASS];                \
        char lastnumberdialed[AST_MAX_EXTENSION];       \
        char mohinterpret[MAX_MUSICCLASS];              \
        char mohsuggest[MAX_MUSICCLASS];                \
        char lastnumberdialed[AST_MAX_EXTENSION];       \
-       int curtone;                                    \
        ast_group_t callgroup;                          \
        ast_group_t pickupgroup;                        \
        int callwaiting;                                \
        ast_group_t callgroup;                          \
        ast_group_t pickupgroup;                        \
        int callwaiting;                                \
@@ -1253,22 +1252,16 @@ struct skinny_subchannel {
        int mwiblink;                                   \
        int cancallforward;                             \
        int getforward;                                 \
        int mwiblink;                                   \
        int cancallforward;                             \
        int getforward;                                 \
-       int callreturn;                                 \
        int dnd;                                        \
        int dnd;                                        \
-       int hascallerid;                                \
        int hidecallerid;                               \
        int amaflags;                                   \
        int hidecallerid;                               \
        int amaflags;                                   \
-       int type;                                       \
        int instance;                                   \
        int group;                                      \
        int instance;                                   \
        int group;                                      \
-       int needdestroy;                                \
        struct ast_format_cap *confcap;                         \
        struct ast_codec_pref confprefs;                \
        struct ast_format_cap *cap;                                     \
        struct ast_codec_pref prefs;                    \
        int nonCodecCapability;                         \
        struct ast_format_cap *confcap;                         \
        struct ast_codec_pref confprefs;                \
        struct ast_format_cap *cap;                                     \
        struct ast_codec_pref prefs;                    \
        int nonCodecCapability;                         \
-       int onhooktime;                                 \
-       int msgstate;                                   \
        int immediate;                                  \
        int nat;                                        \
        int directmedia;                                \
        int immediate;                                  \
        int nat;                                        \
        int directmedia;                                \
@@ -1300,7 +1293,6 @@ static struct skinny_line_options{
        .directmedia = 0,
        .nat = 0,
        .getforward = 0,
        .directmedia = 0,
        .nat = 0,
        .getforward = 0,
-       .needdestroy = 0,
        .prune = 0,
 };
 static struct skinny_line_options *default_line = &default_line_struct;
        .prune = 0,
 };
 static struct skinny_line_options *default_line = &default_line_struct;
@@ -6854,11 +6846,6 @@ static struct ast_channel *skinny_request(const char *type, struct ast_format_ca
                                }
                                continue;
                        }
                                }
                                continue;
                        }
-               } else if (!strcasecmp(v->name, "callreturn")) {
-                       if (type & (TYPE_DEF_LINE | TYPE_LINE)) {
-                               CLINE_OPTS->callreturn = ast_true(v->value);
-                               continue;
-                       }
                } else if (!strcasecmp(v->name, "threewaycalling")) {
                        if (type & (TYPE_DEF_LINE | TYPE_LINE)) {
                                CLINE_OPTS->threewaycalling = ast_true(v->value);
                } else if (!strcasecmp(v->name, "threewaycalling")) {
                        if (type & (TYPE_DEF_LINE | TYPE_LINE)) {
                                CLINE_OPTS->threewaycalling = ast_true(v->value);