[svn-commits] qwell: branch 1.8 r283882 - in /branches/1.8: ./ addons/ main/ res/

[SVN commits to the Digium repositories]

Author: qwell
Date: Fri Aug 27 15:31:55 2010
New Revision: 283882

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

................
  r283881 | qwell | 2010-08-27 15:30:27 -0500 (Fri, 27 Aug 2010) | 15 lines
  
  Merged revisions 283880 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r283880 | qwell | 2010-08-27 15:29:11 -0500 (Fri, 27 Aug 2010) | 8 lines
    
    Fix issue with decoding ^-escaped characters in realtime.
    
    (closes issue #17790)
    Reported by: denzs
    Patches: 
          17790-chunky.diff uploaded by qwell (license 4)
    Tested by: qwell, denzs
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/addons/res_config_mysql.c
    branches/1.8/main/config.c
    branches/1.8/res/res_config_odbc.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/addons/res_config_mysql.c?view=diff&rev=283882&r1=283881&r2=283882
==============================================================================
--- branches/1.8/addons/res_config_mysql.c (original)
+++ branches/1.8/addons/res_config_mysql.c Fri Aug 27 15:31:55 2010
@@ -307,7 +307,7 @@
 	char *orig = chunk;
 	for (; *chunk; chunk++) {
 		if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) {
-			sscanf(chunk + 1, "%02hhd", chunk);
+			sscanf(chunk + 1, "%02hhX", chunk);
 			memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
 		}
 	}

Modified: branches/1.8/main/config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/config.c?view=diff&rev=283882&r1=283881&r2=283882
==============================================================================
--- branches/1.8/main/config.c (original)
+++ branches/1.8/main/config.c Fri Aug 27 15:31:55 2010
@@ -2361,7 +2361,7 @@
 	char *orig = chunk;
 	for (; *chunk; chunk++) {
 		if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) {
-			sscanf(chunk + 1, "%02hhd", chunk);
+			sscanf(chunk + 1, "%02hhX", chunk);
 			memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
 		}
 	}

Modified: branches/1.8/res/res_config_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_config_odbc.c?view=diff&rev=283882&r1=283881&r2=283882
==============================================================================
--- branches/1.8/res/res_config_odbc.c (original)
+++ branches/1.8/res/res_config_odbc.c Fri Aug 27 15:31:55 2010
@@ -62,7 +62,7 @@
 {
 	for (; *chunk; chunk++) {
 		if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) {
-			sscanf(chunk + 1, "%02hhd", chunk);
+			sscanf(chunk + 1, "%02hhX", chunk);
 			memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1);
 		}
 	}