mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 14:50:05 +00:00
* 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.
This commit is contained in:
parent
322e23db24
commit
4bcb2658ff
@ -1,5 +1,10 @@
|
||||
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.
|
||||
|
||||
* resolv/resolv.h (RES_SNGLKUP): Define.
|
||||
|
2
NEWS
2
NEWS
@ -37,7 +37,7 @@ Version 2.10
|
||||
|
||||
* 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.
|
||||
|
||||
|
||||
|
@ -79,5 +79,5 @@ tests: $(objpfx)tst-svc.out
|
||||
$(objpfx)tst-svc.out: tst-svc.input $(objpfx)tst-svc
|
||||
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
|
||||
$(built-program-cmd) < $(word 1,$^) > $@
|
||||
-cmp tst-svc.expect $(objpfx)tst-svc.out
|
||||
@cmp tst-svc.expect $(objpfx)tst-svc.out
|
||||
endif
|
||||
|
@ -74,7 +74,7 @@ __strverscmp (s1, s2)
|
||||
unsigned char c1 = *p1++;
|
||||
unsigned char c2 = *p2++;
|
||||
/* 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;
|
||||
while ((diff = c1 - c2) == 0)
|
||||
@ -85,10 +85,10 @@ __strverscmp (s1, s2)
|
||||
state = next_state[state];
|
||||
c1 = *p1++;
|
||||
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)
|
||||
{
|
||||
|
@ -6,6 +6,8 @@
|
||||
01a
|
||||
0
|
||||
0a
|
||||
2.6.20
|
||||
2.6.21
|
||||
2.8
|
||||
2.8-0.4
|
||||
20
|
||||
|
@ -6,6 +6,7 @@
|
||||
01a
|
||||
00a
|
||||
000
|
||||
2.6.21
|
||||
20
|
||||
212
|
||||
21
|
||||
@ -18,6 +19,7 @@ foo
|
||||
foo-3.0.0
|
||||
foo-3.0.1
|
||||
foo-0.5
|
||||
2.6.20
|
||||
foo-0.4b
|
||||
foo-3.10
|
||||
foo-3.2
|
||||
|
Loading…
Reference in New Issue
Block a user