mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate __strcmp_cg

Browse Source 
The __strcmp_cg code was duplicate of of __strcmp_gc. This patch unifies
these two cases into one.
This commit is contained in:
Ondrej Bilka 2013-05-01 20:55:06 +02:00
parent 1324e37f2e
commit a07c5731d6
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-05-01 Ondřej Bílka <neleai@seznam.cz>
* string/bits/string2.h (__strcmp_cg): Call __strcmp_gc.
2013-05-01 Roland McGrath <roland@hack.frob.com> 2013-05-01 Roland McGrath <roland@hack.frob.com>
* sysdeps/posix/opendir.c: Include <sys/param.h> to get MIN/MAX macros. * sysdeps/posix/opendir.c: Include <sys/param.h> to get MIN/MAX macros.

25
string/bits/string2.h
View File

@ -887,30 +887,7 @@ __stpcpy_small (char *__dest,
} \ } \
__result; })) __result; }))
# define __strcmp_gc(s1, s2, l2) \ # define __strcmp_gc(s1, s2, l2) (- __strcmp_cg (s2, s1, l2))
(__extension__ ({ const unsigned char *__s1 = \
(const unsigned char *) (const char *) (s1); \
register int __result = \
__s1[0] - ((const unsigned char *) \
(const char *) (s2))[0]; \
if (l2 > 0 && __result == 0) \
{ \
__result = (__s1[1] \
- ((const unsigned char *) \
(const char *) (s2))[1]); \
if (l2 > 1 && __result == 0) \
{ \
__result = \
(__s1[2] - ((const unsigned char *) \
(const char *) (s2))[2]); \
if (l2 > 2 && __result == 0) \
__result = \
(__s1[3] \
- ((const unsigned char *) \
(const char *) (s2))[3]); \
} \
} \
__result; }))
#endif #endif