[asterisk-commits] wedhorn: trunk r378001 - in /trunk: ./ channels/chan_skinny.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Dec 13 15:25:35 CST 2012


Author: wedhorn
Date: Thu Dec 13 15:25:31 2012
New Revision: 378001

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378001
Log:
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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=378001&r1=378000&r2=378001
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Thu Dec 13 15:25:31 2012
@@ -671,7 +671,6 @@
 };
 
 #define SOFT_KEY_TEMPLATE_RES_MESSAGE 0x0108
-
 struct soft_key_template_definition {
 	char softKeyLabel[16];
 	uint32_t softKeyEvent;
@@ -2190,7 +2189,7 @@
 	char *tmp;
 
 	switch (ind) {
-	case SUBSTATE_OFFHOOK:
+	case SKINNY_OFFHOOK:
 		return "SKINNY_OFFHOOK";
 	case SKINNY_ONHOOK:
 		return "SKINNY_ONHOOK";
@@ -3362,13 +3361,13 @@
 			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]);




More information about the asterisk-commits mailing list