[svn-commits] twilson: trunk r363335 - in /trunk: ./ main/asterisk.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Apr 24 12:52:26 2012
New Revision: 363335

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=363335
Log:
OpenBSD doesn't have rawmemchr, use strchr

(closes issue ASTERISK-19758)
Reported by: Barry Miller
Tested by: Terry Wilson
Patches: 
  362758-diff uploaded by Barry Miller (license 5434)
........

Merged revisions 362868 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 362869 from http://svn.asterisk.org/svn/asterisk/branches/10

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

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

Modified: trunk/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/asterisk.c?view=diff&rev=363335&r1=363334&r2=363335
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Tue Apr 24 12:52:26 2012
@@ -1320,7 +1320,7 @@
 			/* If we get this far, we have left over characters that have not been processed.
 			 * Advance to the character after the last command read by ast_cli_command_multiple_full.
 			 * We are guaranteed to have at least cmds_read NULLs */
-			while (cmds_read-- && (start_read = rawmemchr(start_read, '\0'))) {
+			while (cmds_read-- && (start_read = strchr(start_read, '\0'))) {
 				start_read++;
 			}
 			memmove(inbuf, start_read, end_buf - start_read);