summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Wedhorn <voip@facts.com.au>2012-12-13 21:25:31 +0000
committerDamien Wedhorn <voip@facts.com.au>2012-12-13 21:25:31 +0000
commit5cf8a1f2e502f4b50bc0f2a8f955798ba3e73275 (patch)
treee3fdd62f41da16894128016defe5ce5c663debaf
parent1e51b9eaa1eda32ea1135ff1df268d5c3908c0f3 (diff)
Minor fixes for chan_skinny
Whitespace, change SUBSTATE_ONHOOK to correct SKINNY_ONHOOK and correct len of 2 strcmp in skinny_setdebug(). (see opticron's review on https://reviewboard.asterisk.org/r/2240/) ........ Merged revisions 377991 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378001 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_skinny.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 7dce0cd9d..1b2c17002 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -671,7 +671,6 @@ struct close_receive_channel_message {
};
#define SOFT_KEY_TEMPLATE_RES_MESSAGE 0x0108
-
struct soft_key_template_definition {
char softKeyLabel[16];
uint32_t softKeyEvent;
@@ -2190,7 +2189,7 @@ static char *callstate2str(int ind)
char *tmp;
switch (ind) {
- case SUBSTATE_OFFHOOK:
+ case SKINNY_OFFHOOK:
return "SKINNY_OFFHOOK";
case SKINNY_ONHOOK:
return "SKINNY_ONHOOK";
@@ -3362,13 +3361,13 @@ static char *handle_skinny_set_debug(struct ast_cli_entry *e, int cmd, struct as
bitmask = DEBUG_PACKET;
} else if (!strncasecmp(arg, "audio", 5)) {
bitmask = DEBUG_AUDIO;
- } else if (!strncasecmp(arg, "lock", 6)) {
+ } else if (!strncasecmp(arg, "lock", 4)) {
bitmask = DEBUG_LOCK;
} else if (!strncasecmp(arg, "template", 8)) {
bitmask = DEBUG_TEMPLATE;
} else if (!strncasecmp(arg, "thread", 6)) {
bitmask = DEBUG_THREAD;
- } else if (!strncasecmp(arg, "hint", 6)) {
+ } else if (!strncasecmp(arg, "hint", 4)) {
bitmask = DEBUG_HINT;
} else {
ast_cli(a->fd, "Skinny Debugging - option '%s' unknown\n", a->argv[i]);