Commit 8f2c9597ba5617d28857bdd8ffeeea7167c72467
2012-04-01T17:56:17
Use straight strtok_r instead of wrapper strtok_r is POSIX-2001 and should be fine. Signed-off-by: Ran Benita <ran234@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
diff --git a/src/maprules.c b/src/maprules.c
index 1537ab8..8015b55 100644
--- a/src/maprules.c
+++ b/src/maprules.c
@@ -36,10 +36,6 @@
#include <ctype.h>
#include <stdlib.h>
-#define X_INCLUDE_STRING_H
-#define XOS_USE_NO_LOCKING
-#include <X11/Xos_r.h>
-
#ifdef DEBUG
#define PR_DEBUG(s) fprintf(stderr,s)
#define PR_DEBUG1(s,a) fprintf(stderr,s,a)
@@ -260,7 +256,7 @@ SetUpRemap(InputLine *line,RemapSpec *remap)
int i;
size_t len;
int ndx;
- _Xstrtokparams strtok_buf;
+ char *strtok_buf;
#ifdef DEBUG
Bool found;
#endif
@@ -271,7 +267,7 @@ SetUpRemap(InputLine *line,RemapSpec *remap)
len = remap->number;
memset(remap, 0, sizeof(RemapSpec));
remap->number = len;
- while ((tok=_XStrtok(str," ",strtok_buf))!=NULL) {
+ while ((tok = strtok_r(str, " ", &strtok_buf)) != NULL) {
#ifdef DEBUG
found= False;
#endif
@@ -387,7 +383,7 @@ CheckLine( InputLine * line,
char *str, *tok;
int nread, i;
FileSpec tmp;
- _Xstrtokparams strtok_buf;
+ char *strtok_buf;
Bool append = False;
if (line->line[0]=='!') {
@@ -427,7 +423,7 @@ CheckLine( InputLine * line,
}
memset(&tmp, 0, sizeof(FileSpec));
str= line->line;
- for (nread= 0;(tok=_XStrtok(str," ",strtok_buf))!=NULL;nread++) {
+ for (nread = 0; (tok = strtok_r(str, " ", &strtok_buf)) != NULL; nread++) {
str= NULL;
if (strcmp(tok,"=")==0) {
nread--;