From: Ran Benita <ran234@gmail.com>
Date: Sun, 1 Apr 2012 14:56:17 +0000 (+0300)
Subject: Use straight strtok_r instead of wrapper
X-Git-Tag: accepted/2.0alpha-wayland/20121109.204519~180
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f2c9597ba5617d28857bdd8ffeeea7167c72467;p=profile%2Fivi%2Flibxkbcommon.git

Use straight strtok_r instead of wrapper

strtok_r is POSIX-2001 and should be fine.

Signed-off-by: Ran Benita <ran234@gmail.com>
---

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--;