[asterisk-commits] qwell: branch 1.6.2 r283881 - in /branches/1.6.2: ./ res/

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Aug 27 15:30:27 2010
New Revision: 283881

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=283881
Log:
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.6.2/   (props changed)
    branches/1.6.2/res/res_config_odbc.c
    branches/1.6.2/res/res_config_pgsql.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Aug 27 15:30:27 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893,283048,283123,283380,283690
+/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893,283048,283123,283380,283690,283880

Modified: branches/1.6.2/res/res_config_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/res_config_odbc.c?view=diff&rev=283881&r1=283880&r2=283881
==============================================================================
--- branches/1.6.2/res/res_config_odbc.c (original)
+++ branches/1.6.2/res/res_config_odbc.c Fri Aug 27 15:30:27 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);
 		}
 	}

Modified: branches/1.6.2/res/res_config_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/res_config_pgsql.c?view=diff&rev=283881&r1=283880&r2=283881
==============================================================================
--- branches/1.6.2/res/res_config_pgsql.c (original)
+++ branches/1.6.2/res/res_config_pgsql.c Fri Aug 27 15:30:27 2010
@@ -296,7 +296,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);
 		}
 	}