AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

* string/strverscmp.c (__strverscmp): Fix last cleanups.

Browse Source 
* string/tst-svc.input: Add new test case.
	* string/tst-svc.expect: Adjust.
	* string/Makefile: Don't ignore tst-svc error.
This commit is contained in:
Ulrich Drepper 2009-04-07 06:51:59 +00:00
parent 322e23db24
commit 4bcb2658ff
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2009-04-06 Ulrich Drepper <drepper@redhat.com> 2009-04-06 Ulrich Drepper <drepper@redhat.com>
* string/strverscmp.c (__strverscmp): Fix last cleanups.
* string/tst-svc.input: Add new test case.
* string/tst-svc.expect: Adjust.
* string/Makefile: Don't ignore tst-svc error.
* sysdeps/x86_64/memchr.S: New file. * sysdeps/x86_64/memchr.S: New file.
* resolv/resolv.h (RES_SNGLKUP): Define. * resolv/resolv.h (RES_SNGLKUP): Define.

2
NEWS
View File

@ -37,7 +37,7 @@ Version 2.10
* New locales: nan_TW@latin, ks_IN * New locales: nan_TW@latin, ks_IN
* Faster strlen and strchr on x86-64. * Faster strlen, strchr, and memchr on x86-64.
Implemented by Ulrich Drepper. Implemented by Ulrich Drepper.

2
string/Makefile
View File

@ -79,5 +79,5 @@ tests: $(objpfx)tst-svc.out
$(objpfx)tst-svc.out: tst-svc.input $(objpfx)tst-svc $(objpfx)tst-svc.out: tst-svc.input $(objpfx)tst-svc
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
$(built-program-cmd) < $(word 1,$^) > $@ $(built-program-cmd) < $(word 1,$^) > $@
-cmp tst-svc.expect $(objpfx)tst-svc.out @cmp tst-svc.expect $(objpfx)tst-svc.out
endif endif

6
string/strverscmp.c
View File

@ -74,7 +74,7 @@ __strverscmp (s1, s2)
unsigned char c1 = *p1++; unsigned char c1 = *p1++;
unsigned char c2 = *p2++; unsigned char c2 = *p2++;
/* Hint: '0' is a digit too. */ /* Hint: '0' is a digit too. */
int state = S_N | ((c1 == '0') + (isdigit (c1) != 0)); int state = S_N + ((c1 == '0') + (isdigit (c1) != 0));
int diff; int diff;
while ((diff = c1 - c2) == 0) while ((diff = c1 - c2) == 0)
@ -85,10 +85,10 @@ __strverscmp (s1, s2)
state = next_state[state]; state = next_state[state];
c1 = *p1++; c1 = *p1++;
c2 = *p2++; c2 = *p2++;
state |= (c1 == '0') + (isdigit (c1) != 0); state += (c1 == '0') + (isdigit (c1) != 0);
} }
state = result_type[state * 3 | (((c2 == '0') + (isdigit (c2) != 0)))]; state = result_type[state * 3 + (((c2 == '0') + (isdigit (c2) != 0)))];
switch (state) switch (state)
{ {

2
string/tst-svc.expect
View File

@ -6,6 +6,8 @@
01a 01a
0 0
0a 0a
2.6.20
2.6.21
2.8 2.8
2.8-0.4 2.8-0.4
20 20

2
string/tst-svc.input
View File

@ -6,6 +6,7 @@
01a 01a
00a 00a
000 000
2.6.21
20 20
212 212
21 21
@ -18,6 +19,7 @@ foo
foo-3.0.0 foo-3.0.0
foo-3.0.1 foo-3.0.1
foo-0.5 foo-0.5
2.6.20
foo-0.4b foo-0.4b
foo-3.10 foo-3.10
foo-3.2 foo-3.2