[asterisk-commits] tilghman: branch 1.6.1 r238983 - in /branches/1.6.1: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jan  8 19:30:38 2010
New Revision: 238983

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

................
  r238916 | tilghman | 2010-01-08 19:08:04 -0600 (Fri, 08 Jan 2010) | 13 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/manager.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/manager.c?view=diff&rev=238983&r1=238982&r2=238983
==============================================================================
--- branches/1.6.1/main/manager.c (original)
+++ branches/1.6.1/main/manager.c Fri Jan  8 19:30:38 2010
@@ -381,7 +381,7 @@
 	{ EVENT_FLAG_DIALPLAN, "dialplan" },
 	{ EVENT_FLAG_ORIGINATE, "originate" },
 	{ EVENT_FLAG_AGI, "agi" },
-	{ -1, "all" },
+	{ INT_MAX, "all" },
 	{ 0, "none" },
 };
 
@@ -456,7 +456,7 @@
 	for (p = string; *p; p++)
 		if (*p < '0' || *p > '9')
 			break;
-	if (!p)	/* all digits */
+	if (!*p) /* all digits */
 		return atoi(string);
 	if (ast_false(string))
 		return 0;