diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
| commit | a6bdd56c5b098599942e4091ae7e2af2d4631b44 (patch) | |
| tree | e0a23167aca0fb1127f4cd78edf458b633b31eac /src/ResConfig.c | |
| parent | 6a13c9e08bb042c81ae904c44a38a50d785c824e (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/ResConfig.c')
| -rw-r--r-- | src/ResConfig.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ResConfig.c b/src/ResConfig.c index 68ccbb7..e9ac7ae 100644 --- a/src/ResConfig.c +++ b/src/ResConfig.c @@ -52,6 +52,7 @@ dealings in this Software without prior written authorization from the IBM Corporation. ******************************************************************/ +/* $XFree86: xc/lib/Xt/ResConfig.c,v 3.8 2001/12/14 19:56:28 dawes Exp $ */ #include "Intrinsic.h" #include "IntrinsicI.h" @@ -61,10 +62,8 @@ Corporation. #include "StringDefs.h" #include "ResConfigP.h" #include <X11/Xatom.h> - -#ifdef DEBUG #include <stdio.h> -#endif +#include <stdlib.h> #define MAX_BUFFER 512 @@ -700,7 +699,7 @@ _search_widget_tree (w, resource, value) { Widget parent = w; char *last_part; - char *remainder; + char *remainder = NULL; char last_token; char *indx, *copy; char *loose, *tight; @@ -992,7 +991,7 @@ _XtResourceConfigurationEH (w, client_data, event) * resource and value fields. */ if (data) { - resource_len = Strtoul (data, &data_ptr, 10); + resource_len = Strtoul ((void *)data, &data_ptr, 10); data_ptr++; data_ptr[resource_len] = '\0'; |