Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Revert "compat: add strtok_r()"

This reverts commit 78457bc.

commit 28c5d9e ("vcs-svn: drop string_pool") previously removed
the only call-site for strtok_r. So let's get rid of the compat
implementation as well.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit 13a23199195bb29d7f9e64baaa35c1718a92c556 1 parent 4dac067
Erik Faye-Lund authored February 26, 2013 gitster committed February 26, 2013
6  Makefile
@@ -101,8 +101,6 @@ all::
101 101
 #
102 102
 # Define NO_MKSTEMPS if you don't have mkstemps in the C library.
103 103
 #
104  
-# Define NO_STRTOK_R if you don't have strtok_r in the C library.
105  
-#
106 104
 # Define NO_FNMATCH if you don't have fnmatch in the C library.
107 105
 #
108 106
 # Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
@@ -1249,10 +1247,6 @@ endif
1249 1247
 ifdef NO_STRTOULL
1250 1248
 	COMPAT_CFLAGS += -DNO_STRTOULL
1251 1249
 endif
1252  
-ifdef NO_STRTOK_R
1253  
-	COMPAT_CFLAGS += -DNO_STRTOK_R
1254  
-	COMPAT_OBJS += compat/strtok_r.o
1255  
-endif
1256 1250
 ifdef NO_FNMATCH
1257 1251
 	COMPAT_CFLAGS += -Icompat/fnmatch
1258 1252
 	COMPAT_CFLAGS += -DNO_FNMATCH
61  compat/strtok_r.c
... ...
@@ -1,61 +0,0 @@
1  
-/* Reentrant string tokenizer.  Generic version.
2  
-   Copyright (C) 1991,1996-1999,2001,2004 Free Software Foundation, Inc.
3  
-   This file is part of the GNU C Library.
4  
-
5  
-   The GNU C Library is free software; you can redistribute it and/or
6  
-   modify it under the terms of the GNU Lesser General Public
7  
-   License as published by the Free Software Foundation; either
8  
-   version 2.1 of the License, or (at your option) any later version.
9  
-
10  
-   The GNU C Library is distributed in the hope that it will be useful,
11  
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
12  
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13  
-   Lesser General Public License for more details.
14  
-
15  
-   You should have received a copy of the GNU Lesser General Public
16  
-   License along with the GNU C Library; if not, write to the Free
17  
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
18  
-   02111-1307 USA.  */
19  
-
20  
-#include "../git-compat-util.h"
21  
-
22  
-/* Parse S into tokens separated by characters in DELIM.
23  
-   If S is NULL, the saved pointer in SAVE_PTR is used as
24  
-   the next starting point.  For example:
25  
-	char s[] = "-abc-=-def";
26  
-	char *sp;
27  
-	x = strtok_r(s, "-", &sp);	// x = "abc", sp = "=-def"
28  
-	x = strtok_r(NULL, "-=", &sp);	// x = "def", sp = NULL
29  
-	x = strtok_r(NULL, "=", &sp);	// x = NULL
30  
-		// s = "abc\0-def\0"
31  
-*/
32  
-char *
33  
-gitstrtok_r (char *s, const char *delim, char **save_ptr)
34  
-{
35  
-  char *token;
36  
-
37  
-  if (s == NULL)
38  
-    s = *save_ptr;
39  
-
40  
-  /* Scan leading delimiters.  */
41  
-  s += strspn (s, delim);
42  
-  if (*s == '\0')
43  
-    {
44  
-      *save_ptr = s;
45  
-      return NULL;
46  
-    }
47  
-
48  
-  /* Find the end of the token.  */
49  
-  token = s;
50  
-  s = strpbrk (token, delim);
51  
-  if (s == NULL)
52  
-    /* This token finishes the string.  */
53  
-    *save_ptr = token + strlen (token);
54  
-  else
55  
-    {
56  
-      /* Terminate the token and make *SAVE_PTR point past it.  */
57  
-      *s = '\0';
58  
-      *save_ptr = s + 1;
59  
-    }
60  
-  return token;
61  
-}
2  config.mak.uname
@@ -321,7 +321,6 @@ ifeq ($(uname_S),Windows)
321 321
 	NO_UNSETENV = YesPlease
322 322
 	NO_STRCASESTR = YesPlease
323 323
 	NO_STRLCPY = YesPlease
324  
-	NO_STRTOK_R = YesPlease
325 324
 	NO_FNMATCH = YesPlease
326 325
 	NO_MEMMEM = YesPlease
327 326
 	# NEEDS_LIBICONV = YesPlease
@@ -476,7 +475,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
476 475
 	NO_UNSETENV = YesPlease
477 476
 	NO_STRCASESTR = YesPlease
478 477
 	NO_STRLCPY = YesPlease
479  
-	NO_STRTOK_R = YesPlease
480 478
 	NO_FNMATCH = YesPlease
481 479
 	NO_MEMMEM = YesPlease
482 480
 	NEEDS_LIBICONV = YesPlease
6  configure.ac
@@ -901,12 +901,6 @@ GIT_CHECK_FUNC(strcasestr,
901 901
 [NO_STRCASESTR=YesPlease])
902 902
 GIT_CONF_SUBST([NO_STRCASESTR])
903 903
 #
904  
-# Define NO_STRTOK_R if you don't have strtok_r
905  
-GIT_CHECK_FUNC(strtok_r,
906  
-[NO_STRTOK_R=],
907  
-[NO_STRTOK_R=YesPlease])
908  
-GIT_CONF_SUBST([NO_STRTOK_R])
909  
-#
910 904
 # Define NO_FNMATCH if you don't have fnmatch
911 905
 GIT_CHECK_FUNC(fnmatch,
912 906
 [NO_FNMATCH=],
5  git-compat-util.h
@@ -421,11 +421,6 @@ extern uintmax_t gitstrtoumax(const char *, char **, int);
421 421
 extern intmax_t gitstrtoimax(const char *, char **, int);
422 422
 #endif
423 423
 
424  
-#ifdef NO_STRTOK_R
425  
-#define strtok_r gitstrtok_r
426  
-extern char *gitstrtok_r(char *s, const char *delim, char **save_ptr);
427  
-#endif
428  
-
429 424
 #ifdef NO_HSTRERROR
430 425
 #define hstrerror githstrerror
431 426
 extern const char *githstrerror(int herror);

0 notes on commit 13a2319

Please sign in to comment.
Something went wrong with that request. Please try again.