Line breaking.

diff --git a/ChangeLog b/ChangeLog
index 6a1cdf7..a92d6a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-17  Bruno Haible  <bruno@clisp.org>
+
+       * lib/string_.h (memmem, mempcpy, memrchr, stpcpy, stpncpy, strcasecmp,
+       strncasecmp, strchr, strchrnul, strdup, strndup, strnlen, strcspn,
+       strpbrk, strspn, strrchr, strsep, strstr, strcasestr, strtok_r): Break
+       long lines.
+
 2007-02-17  Ben Pfaff  <blp@cs.stanford.edu>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/string_.h b/lib/string_.h
index b7cc315..a5887f9 100644 (file)
--- a/lib/string_.h
+++ b/lib/string_.h
@@ -65,7 +65,8 @@ extern void *memmem (void const *__haystack, size_t __haystack_len,
 #elif defined GNULIB_POSIXCHECK
 # undef memmem
 # define memmem(a,al,b,bl) \
-    (GL_LINK_WARNING ("memmem is unportable - use gnulib module memmem for portability"), \
+    (GL_LINK_WARNING ("memmem is unportable - "\
+                      "use gnulib module memmem for portability"), \
      memmem (a, al, b, bl))
 #endif
 
@@ -79,7 +80,8 @@ extern void *mempcpy (void *restrict __dest, void const *restrict __src,
 #elif defined GNULIB_POSIXCHECK
 # undef mempcpy
 # define mempcpy(a,b,n) \
-    (GL_LINK_WARNING ("mempcpy is unportable - use gnulib module mempcpy for portability"), \
+    (GL_LINK_WARNING ("mempcpy is unportable - "\
+                      "use gnulib module mempcpy for portability"), \
      mempcpy (a, b, n))
 #endif
 
@@ -91,7 +93,8 @@ extern void *memrchr (void const *, int, size_t);
 #elif defined GNULIB_POSIXCHECK
 # undef memrchr
 # define memrchr(a,b,c) \
-    (GL_LINK_WARNING ("memrchr is unportable - use gnulib module memrchr for portability"), \
+    (GL_LINK_WARNING ("memrchr is unportable - "\
+                      "use gnulib module memrchr for portability"), \
      memrchr (a, b, c))
 #endif
 
@@ -103,7 +106,8 @@ extern char *stpcpy (char *restrict __dst, char const *restrict __src);
 #elif defined GNULIB_POSIXCHECK
 # undef stpcpy
 # define stpcpy(a,b) \
-    (GL_LINK_WARNING ("stpcpy is unportable - use gnulib module stpcpy for portability"), \
+    (GL_LINK_WARNING ("stpcpy is unportable - "\
+                      "use gnulib module stpcpy for portability"), \
      stpcpy (a, b))
 #endif
 
@@ -118,7 +122,8 @@ extern char *stpncpy (char *restrict __dst, char const *restrict __src,
 #elif defined GNULIB_POSIXCHECK
 # undef stpncpy
 # define stpncpy(a,b,n) \
-    (GL_LINK_WARNING ("stpncpy is unportable - use gnulib module stpncpy for portability"), \
+    (GL_LINK_WARNING ("stpncpy is unportable - "\
+                      "use gnulib module stpncpy for portability"), \
      stpncpy (a, b, n))
 #endif
 
@@ -135,7 +140,12 @@ extern int strcasecmp (char const *s1, char const *s2);
    as a sequence of bytes, not of characters.   */
 # undef strcasecmp
 # define strcasecmp(a,b) \
-    (GL_LINK_WARNING ("strcasecmp cannot work correctly on character strings in multibyte locales - use mbscasecmp if you care about internationalization, or use c_strcasecmp (from gnulib module c-strcase) if you want a locale independent function"), \
+    (GL_LINK_WARNING ("strcasecmp cannot work correctly on character strings " \
+                      "in multibyte locales - "\
+                      "use mbscasecmp if you care about " \
+                      "internationalization, or use c_strcasecmp (from " \
+                      "gnulib module c-strcase) if you want a locale " \
+                      "independent function"), \
      strcasecmp (a, b))
 #endif
 
@@ -152,7 +162,12 @@ extern int strncasecmp (char const *s1, char const *s2, size_t n);
    as a sequence of bytes, not of characters.  */
 # undef strncasecmp
 # define strncasecmp(a,b,n) \
-    (GL_LINK_WARNING ("strncasecmp cannot work correctly on character strings in multibyte locales - use mbsncasecmp or mbspcasecmp if you care about internationalization, or use c_strncasecmp (from gnulib module c-strcase) if you want a locale independent function"), \
+    (GL_LINK_WARNING ("strncasecmp cannot work correctly on character " \
+                      "strings in multibyte locales - "\
+                      "use mbsncasecmp or mbspcasecmp if you care about " \
+                      "internationalization, or use c_strncasecmp (from " \
+                      "gnulib module c-strcase) if you want a locale " \
+                      "independent function"), \
      strncasecmp (a, b, n))
 #endif
 
@@ -161,7 +176,9 @@ extern int strncasecmp (char const *s1, char const *s2, size_t n);
    GB18030 and the character to be searched is a digit.  */
 # undef strchr
 # define strchr(s,c) \
-    (GL_LINK_WARNING ("strchr cannot work correctly on character strings in some multibyte locales - use mbschr if you care about internationalization"), \
+    (GL_LINK_WARNING ("strchr cannot work correctly on character strings " \
+                      "in some multibyte locales - "\
+                      "use mbschr if you care about internationalization"), \
      strchr (s, c))
 #endif
 
@@ -173,7 +190,8 @@ extern char *strchrnul (char const *__s, int __c_in);
 #elif defined GNULIB_POSIXCHECK
 # undef strchrnul
 # define strchrnul(a,b) \
-    (GL_LINK_WARNING ("strchrnul is unportable - use gnulib module strchrnul for portability"), \
+    (GL_LINK_WARNING ("strchrnul is unportable - "\
+                      "use gnulib module strchrnul for portability"), \
      strchrnul (a, b))
 #endif
 
@@ -185,7 +203,8 @@ extern char *strdup (char const *__s);
 #elif defined GNULIB_POSIXCHECK
 # undef strdup
 # define strdup(a) \
-    (GL_LINK_WARNING ("strdup is unportable - use gnulib module strdup for portability"), \
+    (GL_LINK_WARNING ("strdup is unportable - "\
+                      "use gnulib module strdup for portability"), \
      strdup (a))
 #endif
 
@@ -201,7 +220,8 @@ extern char *strndup (char const *__string, size_t __n);
 #elif defined GNULIB_POSIXCHECK
 # undef strndup
 # define strndup(a,n) \
-    (GL_LINK_WARNING ("strndup is unportable - use gnulib module strndup for portability"), \
+    (GL_LINK_WARNING ("strndup is unportable - "\
+                      "use gnulib module strndup for portability"), \
      strndup (a, n))
 #endif
 
@@ -215,7 +235,8 @@ extern size_t strnlen (char const *__string, size_t __maxlen);
 #elif defined GNULIB_POSIXCHECK
 # undef strnlen
 # define strnlen(a,n) \
-    (GL_LINK_WARNING ("strnlen is unportable - use gnulib module strnlen for portability"), \
+    (GL_LINK_WARNING ("strnlen is unportable - "\
+                      "use gnulib module strnlen for portability"), \
      strnlen (a, n))
 #endif
 
@@ -226,7 +247,9 @@ extern size_t strnlen (char const *__string, size_t __maxlen);
    digit.  */
 # undef strcspn
 # define strcspn(s,a) \
-    (GL_LINK_WARNING ("strcspn cannot work correctly on character strings in multibyte locales - use mbscspn if you care about internationalization"), \
+    (GL_LINK_WARNING ("strcspn cannot work correctly on character strings " \
+                      "in multibyte locales - "\
+                      "use mbscspn if you care about internationalization"), \
      strcspn (s, a))
 #endif
 
@@ -242,13 +265,16 @@ extern char *strpbrk (char const *__s, char const *__accept);
    digit.  */
 #  undef strpbrk
 #  define strpbrk(s,a) \
-     (GL_LINK_WARNING ("strpbrk cannot work correctly on character strings in multibyte locales - use mbspbrk if you care about internationalization"), \
+     (GL_LINK_WARNING ("strpbrk cannot work correctly on character strings " \
+                       "in multibyte locales - "\
+                       "use mbspbrk if you care about internationalization"), \
       strpbrk (s, a))
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef strpbrk
 # define strpbrk(s,a) \
-    (GL_LINK_WARNING ("strpbrk is unportable - use gnulib module strpbrk for portability"), \
+    (GL_LINK_WARNING ("strpbrk is unportable - "\
+                      "use gnulib module strpbrk for portability"), \
      strpbrk (s, a))
 #endif
 
@@ -257,7 +283,9 @@ extern char *strpbrk (char const *__s, char const *__accept);
    Even in this simple case, it cannot work with multibyte strings.  */
 # undef strspn
 # define strspn(s,a) \
-    (GL_LINK_WARNING ("strspn cannot work correctly on character strings in multibyte locales - use mbsspn if you care about internationalization"), \
+    (GL_LINK_WARNING ("strspn cannot work correctly on character strings " \
+                      "in multibyte locales - "\
+                      "use mbsspn if you care about internationalization"), \
      strspn (s, a))
 #endif
 
@@ -266,7 +294,9 @@ extern char *strpbrk (char const *__s, char const *__accept);
    GB18030 and the character to be searched is a digit.  */
 # undef strrchr
 # define strrchr(s,c) \
-    (GL_LINK_WARNING ("strrchr cannot work correctly on character strings in some multibyte locales - use mbsrchr if you care about internationalization"), \
+    (GL_LINK_WARNING ("strrchr cannot work correctly on character strings " \
+                      "in some multibyte locales - "\
+                      "use mbsrchr if you care about internationalization"), \
      strrchr (s, c))
 #endif
 
@@ -293,13 +323,16 @@ extern char *strsep (char **restrict __stringp, char const *restrict __delim);
 # if defined GNULIB_POSIXCHECK
 #  undef strsep
 #  define strsep(s,d) \
-     (GL_LINK_WARNING ("strsep cannot work correctly on character strings in multibyte locales - use mbssep if you care about internationalization"), \
+     (GL_LINK_WARNING ("strsep cannot work correctly on character strings " \
+                       "in multibyte locales - "\
+                       "use mbssep if you care about internationalization"), \
       strsep (s, d))
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef strsep
 # define strsep(s,d) \
-    (GL_LINK_WARNING ("strsep is unportable - use gnulib module strsep for portability"), \
+    (GL_LINK_WARNING ("strsep is unportable - "\
+                      "use gnulib module strsep for portability"), \
      strsep (s, d))
 #endif
 
@@ -310,7 +343,9 @@ extern char *strsep (char **restrict __stringp, char const *restrict __delim);
    as a sequence of bytes, not of characters.  */
 # undef strstr
 # define strstr(a,b) \
-    (GL_LINK_WARNING ("strstr cannot work correctly on character strings in most multibyte locales - use mbsstr if you care about internationalization"), \
+    (GL_LINK_WARNING ("strstr cannot work correctly on character strings " \
+                      "in most multibyte locales - "\
+                      "use mbsstr if you care about internationalization"), \
      strstr (a, b))
 #endif
 
@@ -325,7 +360,11 @@ extern char *strcasestr (const char *haystack, const char *needle);
    locales.  */
 # undef strcasestr
 # define strcasestr(a,b) \
-    (GL_LINK_WARNING ("strcasestr does work correctly on character strings in multibyte locales - use mbscasestr if you care about internationalization, or use c-strcasestr if you want a locale independent function"), \
+    (GL_LINK_WARNING ("strcasestr does work correctly on character strings " \
+                      "in multibyte locales - "\
+                      "use mbscasestr if you care about " \
+                      "internationalization, or use c-strcasestr if you want " \
+                      "a locale independent function"), \
      strcasestr (a, b))
 #endif
 
@@ -359,13 +398,16 @@ extern char *strtok_r (char *restrict s, char const *restrict delim,
 # if defined GNULIB_POSIXCHECK
 #  undef strtok_r
 #  define strtok_r(s,d,p) \
-     (GL_LINK_WARNING ("strtok_r cannot work correctly on character strings in multibyte locales - use mbstok_r if you care about internationalization"), \
+     (GL_LINK_WARNING ("strtok_r cannot work correctly on character strings " \
+                       "in multibyte locales - "\
+                       "use mbstok_r if you care about internationalization"), \
       strtok_r (s, d, p))
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef strtok_r
 # define strtok_r(s,d,p) \
-    (GL_LINK_WARNING ("strtok_r is unportable - use gnulib module strtok_r for portability"), \
+    (GL_LINK_WARNING ("strtok_r is unportable - "\
+                      "use gnulib module strtok_r for portability"), \
      strtok_r (s, d, p))
 #endif