Commit 8833d328 authored by Kyle McMartin's avatar Kyle McMartin Committed by Linus Torvalds
Browse files

[PATCH] Clean up arch-overrides in linux/string.h 



Some string functions were safely overrideable in lib/string.c, but their
corresponding declarations in linux/string.h were not.  Correct this, and
make strcspn overrideable.

Odds of someone wanting to do optimized assembly of these are small, but
for the sake of cleanliness, might as well bring them into line with the
rest of the file.

Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 894b5779

include/linux/string.h

+12 −5
Original line number Diff line number Diff line
@@ -13,11 +13,6 @@ 
extern "C" {

#endif



extern char * strpbrk(const char *,const char *);

extern char * strsep(char **,const char *);

extern __kernel_size_t strspn(const char *,const char *);

extern __kernel_size_t strcspn(const char *,const char *);



extern char *strndup_user(const char __user *, long);



/*
@@ -70,6 +65,18 @@ extern __kernel_size_t strlen(const char *); 
#ifndef __HAVE_ARCH_STRNLEN

extern __kernel_size_t strnlen(const char *,__kernel_size_t);

#endif

#ifndef __HAVE_ARCH_STRPBRK

extern char * strpbrk(const char *,const char *);

#endif

#ifndef __HAVE_ARCH_STRSEP

extern char * strsep(char **,const char *);

#endif

#ifndef __HAVE_ARCH_STRSPN

extern __kernel_size_t strspn(const char *,const char *);

#endif

#ifndef __HAVE_ARCH_STRCSPN

extern __kernel_size_t strcspn(const char *,const char *);

#endif



#ifndef __HAVE_ARCH_MEMSET

extern void * memset(void *,int,__kernel_size_t);

lib/string.c

+2 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ size_t strspn(const char *s, const char *accept) 
EXPORT_SYMBOL(strspn);

#endif



#ifndef __HAVE_ARCH_STRCSPN

/**

 * strcspn - Calculate the length of the initial substring of @s which does

 * 	not contain letters in @reject
@@ -384,6 +385,7 @@ size_t strcspn(const char *s, const char *reject) 
	return count;

}

EXPORT_SYMBOL(strcspn);

#endif



#ifndef __HAVE_ARCH_STRPBRK

/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE