[PATCH:libXt 4/6] Fix char vs. unsigned char warnings.

Thomas Klausner wiz at NetBSD.org
Tue Jun 25 14:02:48 PDT 2013


---
 src/ResConfig.c | 4 ++--
 src/TMparse.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ResConfig.c b/src/ResConfig.c
index 152d9cf..5a7f6d2 100644
--- a/src/ResConfig.c
+++ b/src/ResConfig.c
@@ -892,7 +892,7 @@ _XtResourceConfigurationEH (
 	int		actual_format;
 	unsigned long	nitems;
 	unsigned long	leftover;
-	unsigned char	*data = NULL;
+	char		*data = NULL;
 	unsigned long	resource_len;
 	char		*data_ptr;
 	char		*resource;
@@ -952,7 +952,7 @@ _XtResourceConfigurationEH (
 		pd->rcm_data, 0L, 8192L,
 		TRUE, XA_STRING,
 		&actual_type, &actual_format, &nitems, &leftover,
-		&data ) == Success && actual_type == XA_STRING
+		(unsigned char **)&data ) == Success && actual_type == XA_STRING
 			   && actual_format == 8) {
 	/*
 	 *      data format is:
diff --git a/src/TMparse.c b/src/TMparse.c
index 83b39d5..df94181 100644
--- a/src/TMparse.c
+++ b/src/TMparse.c
@@ -1472,10 +1472,10 @@ static String ParseRepeat(
 {
 
     /*** Parse the repetitions, for double click etc... ***/
-    if (*str != '(' || !(isdigit(str[1]) || str[1] == '+' || str[1] == ')'))
+    if (*str != '(' || !(isdigit((unsigned char)str[1]) || str[1] == '+' || str[1] == ')'))
 	return str;
     str++;
-    if (isdigit(*str)) {
+    if (isdigit((unsigned char)*str)) {
 	String start = str;
 	char repStr[7];
 	size_t len;
-- 
1.8.3.1



More information about the xorg-devel mailing list