Remove K&R cruft.

diff --git a/lib/strchrnul.c b/lib/strchrnul.c
index 694e24a..db42e28 100644 (file)
--- a/lib/strchrnul.c
+++ b/lib/strchrnul.c
@@ -20,12 +20,11 @@
 
 /* Find the first occurrence of C in S or the final NUL byte.  */
 char *
 
 /* Find the first occurrence of C in S or the final NUL byte.  */
 char *

-strchrnul (s, c_in)
-     const char *s;
-     int c_in;
+strchrnul (const char *s, int c_in)

 {
 {

-  while (*s && (*s != c_in))
+  unsigned char c = c_in;
+  while (*s && (*s != c))

     s++;
 
     s++;
 

-  return (char*) s;
+  return (char *) s;

 }
 }

diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4
index 565e338..51edfb3 100644 (file)
--- a/m4/strchrnul.m4
+++ b/m4/strchrnul.m4
@@ -1,4 +1,4 @@
-# strchrnul.m4 serial 1
+# strchrnul.m4 serial 2

 dnl Copyright (C) 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Copyright (C) 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General


@@ -18,6 +18,4 @@ AC_DEFUN([gl_FUNC_STRCHRNUL],
 ])
 
 # Prerequisites of lib/strchrnul.c.
 ])
 
 # Prerequisites of lib/strchrnul.c.

-AC_DEFUN([gl_PREREQ_STRCHRNUL], [
-  AC_CHECK_HEADERS_ONCE(string.h)
-])
+AC_DEFUN([gl_PREREQ_STRCHRNUL], [:])