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.

diff --git a/ChangeLog b/ChangeLog
index 5a23ff6..deec08f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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'.
        * modules/memcasecmp-tests: New file.
        * tests/test-memcasecmp.c: New file, based on tests/test-memcmp.c.

diff --git a/lib/memcoll.c b/lib/memcoll.c
index 39b383c..1646b1d 100644 (file)
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -93,9 +93,9 @@ memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
   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

diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index d2ddc33..8fc6ba2 100644 (file)
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -60,17 +60,17 @@ xmemcoll (char *s1, size_t s1len, char *s2, size_t s2len)
   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;
 }