summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Klausner <wiz@NetBSD.org>2013-06-25 23:02:48 +0200
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-09 23:33:27 -0700
commit9dc5fb0b9640b79a234b58e640e05d8276556beb (patch)
tree9dda9e2907e94a88faa8aed7fb96c66c01a4af8f
parent3919044bd7d3bcb85ce3425a43b8889a248a7542 (diff)
downloadxorg-lib-libXt-9dc5fb0b9640b79a234b58e640e05d8276556beb.tar.gz
Fix char vs. unsigned char warnings.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/ResConfig.c4
-rw-r--r--src/TMparse.c4
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;