undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "compat: add strtok_r()"

Browse Source 
This reverts commit 78457bc0ccc1af8b9eb776a0b17986ebd50442bc.

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>
This commit is contained in:
Erik Faye-Lund 2013-02-26 17:58:38 +01:00 committed by Junio C Hamano
parent 4dac0679fe
commit 13a2319919
5 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -101,8 +101,6 @@ all::
# #
# Define NO_MKSTEMPS if you don't have mkstemps in the C library. # Define NO_MKSTEMPS if you don't have mkstemps in the C library.
# #
# Define NO_STRTOK_R if you don't have strtok_r in the C library.
#
# Define NO_FNMATCH if you don't have fnmatch in the C library. # Define NO_FNMATCH if you don't have fnmatch in the C library.
# #
# Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the # Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
@ -1249,10 +1247,6 @@ endif
ifdef NO_STRTOULL ifdef NO_STRTOULL
COMPAT_CFLAGS += -DNO_STRTOULL COMPAT_CFLAGS += -DNO_STRTOULL
endif endif
ifdef NO_STRTOK_R
COMPAT_CFLAGS += -DNO_STRTOK_R
COMPAT_OBJS += compat/strtok_r.o
endif
ifdef NO_FNMATCH ifdef NO_FNMATCH
COMPAT_CFLAGS += -Icompat/fnmatch COMPAT_CFLAGS += -Icompat/fnmatch
COMPAT_CFLAGS += -DNO_FNMATCH COMPAT_CFLAGS += -DNO_FNMATCH

61
compat/strtok_r.c
View File

@ -1,61 +0,0 @@
/* Reentrant string tokenizer. Generic version.
Copyright (C) 1991,1996-1999,2001,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include "../git-compat-util.h"
/* Parse S into tokens separated by characters in DELIM.
If S is NULL, the saved pointer in SAVE_PTR is used as
the next starting point. For example:
char s[] = "-abc-=-def";
char *sp;
x = strtok_r(s, "-", &sp); // x = "abc", sp = "=-def"
x = strtok_r(NULL, "-=", &sp); // x = "def", sp = NULL
x = strtok_r(NULL, "=", &sp); // x = NULL
// s = "abc\0-def\0"
*/
char *
gitstrtok_r (char *s, const char *delim, char **save_ptr)
{
char *token;
if (s == NULL)
s = *save_ptr;
/* Scan leading delimiters. */
s += strspn (s, delim);
if (*s == '\0')
{
*save_ptr = s;
return NULL;
}
/* Find the end of the token. */
token = s;
s = strpbrk (token, delim);
if (s == NULL)
/* This token finishes the string. */
*save_ptr = token + strlen (token);
else
{
/* Terminate the token and make *SAVE_PTR point past it. */
*s = '\0';
*save_ptr = s + 1;
}
return token;
}

2
config.mak.uname
View File

@ -321,7 +321,6 @@ ifeq ($(uname_S),Windows)
NO_UNSETENV = YesPlease NO_UNSETENV = YesPlease
NO_STRCASESTR = YesPlease NO_STRCASESTR = YesPlease
NO_STRLCPY = YesPlease NO_STRLCPY = YesPlease
NO_STRTOK_R = YesPlease
NO_FNMATCH = YesPlease NO_FNMATCH = YesPlease
NO_MEMMEM = YesPlease NO_MEMMEM = YesPlease
# NEEDS_LIBICONV = YesPlease # NEEDS_LIBICONV = YesPlease
@ -476,7 +475,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_UNSETENV = YesPlease NO_UNSETENV = YesPlease
NO_STRCASESTR = YesPlease NO_STRCASESTR = YesPlease
NO_STRLCPY = YesPlease NO_STRLCPY = YesPlease
NO_STRTOK_R = YesPlease
NO_FNMATCH = YesPlease NO_FNMATCH = YesPlease
NO_MEMMEM = YesPlease NO_MEMMEM = YesPlease
NEEDS_LIBICONV = YesPlease NEEDS_LIBICONV = YesPlease

6
configure.ac
View File

@ -901,12 +901,6 @@ GIT_CHECK_FUNC(strcasestr,
[NO_STRCASESTR=YesPlease]) [NO_STRCASESTR=YesPlease])
GIT_CONF_SUBST([NO_STRCASESTR]) GIT_CONF_SUBST([NO_STRCASESTR])
# #
# Define NO_STRTOK_R if you don't have strtok_r
GIT_CHECK_FUNC(strtok_r,
[NO_STRTOK_R=],
[NO_STRTOK_R=YesPlease])
GIT_CONF_SUBST([NO_STRTOK_R])
#
# Define NO_FNMATCH if you don't have fnmatch # Define NO_FNMATCH if you don't have fnmatch
GIT_CHECK_FUNC(fnmatch, GIT_CHECK_FUNC(fnmatch,
[NO_FNMATCH=], [NO_FNMATCH=],

5
git-compat-util.h
View File

@ -421,11 +421,6 @@ extern uintmax_t gitstrtoumax(const char *, char **, int);
extern intmax_t gitstrtoimax(const char *, char **, int); extern intmax_t gitstrtoimax(const char *, char **, int);
#endif #endif
#ifdef NO_STRTOK_R
#define strtok_r gitstrtok_r
extern char *gitstrtok_r(char *s, const char *delim, char **save_ptr);
#endif
#ifdef NO_HSTRERROR #ifdef NO_HSTRERROR
#define hstrerror githstrerror #define hstrerror githstrerror
extern const char *githstrerror(int herror); extern const char *githstrerror(int herror);