Fix typo, improve comment, remove superfluous #undefs, add missing #undef.

diff --git a/ChangeLog b/ChangeLog
index 3f84a12..edb0234 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-11  Tom de Vries  <tom@codesourcery.com>
+
+       * string/str-two-way.h:  Fix typo RESULT_TYPE -> RETURN_TYPE in
+       comment.
+       Add RET0_IF_0 and CHECK_EOL to macro list in comment.
+       (AVAILABLE1, AVAILABLE2, AVAILABLE1_USES_J): Remove superfluous undef.
+       (CHECK_EOL): Add undef.
+
 2013-02-11   Ondřej Bílka  <neleai@seznam.cz>
 
        * bits/stdlib-bsearch.h: New file.

diff --git a/string/str-two-way.h b/string/str-two-way.h
index 8912f24..1cc20ee 100644 (file)
--- a/string/str-two-way.h
+++ b/string/str-two-way.h
@@ -19,7 +19,7 @@
 
 /* Before including this file, you need to include <string.h> (and
    <config.h> before that, if not part of libc), and define:
-     RESULT_TYPE             A macro that expands to the return type.
+     RETURN_TYPE             A macro that expands to the return type.
      AVAILABLE(h, h_l, j, n_l)
                             A macro that returns nonzero if there are
                             at least N_L bytes left starting at H[J].
@@ -37,7 +37,11 @@
                             The argument is an 'unsigned char'; the result
                             must be an 'unsigned char' as well.
 
-  This file undefines the macros documented above, and defines
+  Other macros you may optionally define:
+     RET0_IF_0(a)            Documented below at default definition.
+     CHECK_EOL               Same.
+
+  This file undefines the macros listed above, and defines
   LONG_NEEDLE_THRESHOLD.
 */
 
@@ -516,10 +520,8 @@ two_way_long_needle (const unsigned char *haystack, size_t haystack_len,
 }
 
 #undef AVAILABLE
-#undef AVAILABLE1
-#undef AVAILABLE2
-#undef AVAILABLE1_USES_J
 #undef CANON_ELEMENT
 #undef CMP_FUNC
 #undef RET0_IF_0
 #undef RETURN_TYPE
+#undef CHECK_EOL