Mercurial > hg > octave-lyh > gnulib-hg
changeset 13719:ba8adb841ec0
memcoll, xmemcoll: Clarify size vs. length.
* modules/memcoll.c (memcoll0): Clarify specification.
* modules/xmemcoll.c (xmemcoll0): Likewise. Reduce by 1 the lengths
passed to collate_error.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Wed, 22 Sep 2010 12:35:30 +0200 |
parents | 66bcc6bf731b |
children | 593b9e6a58a7 |
files | ChangeLog lib/memcoll.c lib/xmemcoll.c |
diffstat | 3 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-09-22 Bruno Haible <bruno@clisp.org> + + memcoll, xmemcoll: Clarify size vs. length. + * modules/memcoll.c (memcoll0): Clarify specification. + * modules/xmemcoll.c (xmemcoll0): Likewise. Reduce by 1 the lengths + passed to collate_error. + 2010-09-22 Bruno Haible <bruno@clisp.org> Tests for module 'memcasecmp'.
--- a/lib/memcoll.c +++ b/lib/memcoll.c @@ -93,9 +93,9 @@ return diff; } -/* Compare S1 (with size S1SIZE) and S2 (with length S2SIZE) according - to the LC_COLLATE locale. S1 and S2 are both blocks of memory with - nonzero sizes, and the last byte in each block must be a null byte. +/* Compare S1 (a memory block of size S1SIZE, with a NUL as last byte) + and S2 (a memory block of size S2SIZE, with a NUL as last byte) + according to the LC_COLLATE locale. S1SIZE and S2SIZE must be > 0. Set errno to an error number if there is an error, and to zero otherwise. */ int
--- a/lib/xmemcoll.c +++ b/lib/xmemcoll.c @@ -60,17 +60,17 @@ return diff; } -/* Compare S1 (with size S1SIZE) and S2 (with length S2SIZE) according - to the LC_COLLATE locale. S1 and S2 are both blocks of memory with - nonzero sizes, and the last byte in each block must be a null byte. +/* Compare S1 (a memory block of size S1SIZE, with a NUL as last byte) + and S2 (a memory block of size S2SIZE, with a NUL as last byte) + according to the LC_COLLATE locale. S1SIZE and S2SIZE must be > 0. Report an error and exit if there is an error. */ int -xmemcoll0 (char const *s1, size_t s1len, char const *s2, size_t s2len) +xmemcoll0 (char const *s1, size_t s1size, char const *s2, size_t s2size) { - int diff = memcoll0 (s1, s1len, s2, s2len); + int diff = memcoll0 (s1, s1size, s2, s2size); int collation_errno = errno; if (collation_errno) - collate_error (collation_errno, s1, s1len, s2, s2len); + collate_error (collation_errno, s1, s1size - 1, s2, s2size - 1); return diff; }