about summary refs log tree commit diff
path: root/ctype/ctype-extn.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-01-05 15:06:57 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-01-05 15:06:57 +0000
commitb8986484e47d6c9b3aecbd259dac52b4c9c99e0d (patch)
treee7114186d221e4388c25b08188cfe50a956c5717 /ctype/ctype-extn.c
parenta287953a45b0759ce08349a299a458c89b7d8276 (diff)
downloadglibc-b8986484e47d6c9b3aecbd259dac52b4c9c99e0d.tar.gz
glibc-b8986484e47d6c9b3aecbd259dac52b4c9c99e0d.tar.xz
glibc-b8986484e47d6c9b3aecbd259dac52b4c9c99e0d.zip
Fix isblank / isascii / toascii namespace (bug 17635).
Use of isblank brings in isascii and toascii, but isblank is a C99
function and the other two aren't; similarly, isascii and toascii are
UNIX98 functions and bring in isblank, which isn't.  (Not a
conformance issue because of the is* and to* reservation, but still
contrary to glibc practice.)  This patch fixes this by splitting
isblank out of ctype-extn.c to a separate ctype-c99.c.  isblank_l is
also moved to a separate file, ctype-c99_l.c (non-XSI POSIX.1-2008 has
isblank_l, but isascii / toascii are marked OB XSI).  (In principle
all these functions could go in separate files - that's optimal for
static linking - but they are also all very small, and splitting them
all out is not needed to fix the present bug.)

Tested for x86_64 (testsuite, and that installed stripped shared
libraries are unchanged by the patch - the ordering in which new and
existing sources are listed in ctype/Makefile is arranged so functions
go in the same order so that this comparison works).

	[BZ #17635]
	* ctype/ctype-c99.c: New file.  isblank implementation moved from
	...
	* ctype/ctype-extn.c: ... here.
	(__isblank_l): Move to ...
	* ctype/ctype-c99_l.c: ... here.  New file.
	* ctype/Makefile (routines): Add ctype-c99 and ctype-c99_l.
	* conform/Makefile (test-xfail-ISO99/ctype.h/linknamespace):
	Remove variable.
	(test-xfail-ISO11/ctype.h/linknamespace): Likewise.
	(test-xfail-XPG3/ctype.h/linknamespace): Likewise.
	(test-xfail-XPG4/ctype.h/linknamespace): Likewise.
	(test-xfail-UNIX98/ctype.h/linknamespace): Likewise.
	(test-xfail-POSIX2008/ctype.h/linknamespace): Likewise.
Diffstat (limited to 'ctype/ctype-extn.c')
-rw-r--r--ctype/ctype-extn.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/ctype/ctype-extn.c b/ctype/ctype-extn.c
index dcc9874894..0073c1a036 100644
--- a/ctype/ctype-extn.c
+++ b/ctype/ctype-extn.c
@@ -23,14 +23,7 @@
 #define __ctype_toupper \
   ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128)
 
-/* Real function versions of the non-ANSI ctype functions.  isblank is
-   now in ISO C99 but we leave it here.  */
-
-int
-isblank (int c)
-{
-  return __isctype (c, _ISblank);
-}
+/* Real function versions of the non-ANSI ctype functions.  */
 
 int
 _tolower (int c)
@@ -56,11 +49,3 @@ isascii (int c)
   return __isascii (c);
 }
 weak_alias (isascii, __isascii_l)
-
-
-int
-__isblank_l (int c, __locale_t l)
-{
-  return __isctype_l (c, _ISblank, l);
-}
-weak_alias (__isblank_l, isblank_l)