[asterisk-commits] tilghman: trunk r238916 - in /trunk: ./ main/manager.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Jan 8 19:08:08 CST 2010


Author: tilghman
Date: Fri Jan  8 19:08:04 2010
New Revision: 238916

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=238916
Log:
Merged revisions 238915 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r238915 | tilghman | 2010-01-08 18:57:58 -0600 (Fri, 08 Jan 2010) | 6 lines
  
  -1 is interpreted as an error, intead of the maximum mask.
  (closes issue #16241)
   Reported by: vnovy
   Patches: 
         manager.c.patch uploaded by vnovy (license 922)
........

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

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

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=238916&r1=238915&r2=238916
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Fri Jan  8 19:08:04 2010
@@ -980,7 +980,7 @@
 	{ EVENT_FLAG_DIALPLAN, "dialplan" },
 	{ EVENT_FLAG_ORIGINATE, "originate" },
 	{ EVENT_FLAG_AGI, "agi" },
-	{ -1, "all" },
+	{ INT_MAX, "all" },
 	{ 0, "none" },
 };
 
@@ -1062,7 +1062,7 @@
 			break;
 		}
 	}
-	if (!p)	{ /* all digits */
+	if (!*p) { /* all digits */
 		return atoi(string);
 	}
 	if (ast_false(string)) {




More information about the asterisk-commits mailing list