From: Bruno Haible <bruno@clisp.org>
Date: Fri, 15 Nov 2002 17:36:03 +0000 (+0000)
Subject: Minimize diffs to glibc. Modernize.
X-Git-Tag: cvs-readonly~5201
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=b51fcc0b038ac4d720d7d34ad98d78a14824e444;p=gnulib.git

Minimize diffs to glibc. Modernize.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 929750acb..aa6c66261 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,16 @@
+2002-11-15  Bruno Haible  <bruno@clisp.org>
+
+	* strcspn.c: Include <stddef.h>.
+	(strcspn): Use ANSI C function declaration. Change return type to
+	size_t. Use NULL.
+	* strpbrk.c: Minimize diffs to glibc. Include <stddef.h>.
+	(strpbrk): Use NULL.
+	* strpbrk.h (PARAMS): Remove macro.
+	(strpbrk): Use ANSI C function declaration.
+	* strstr.c: Don't include <sys/types.h>.
+	* strstr.h (PARAMS): Remove macro.
+	(strstr): Use ANSI C function declarations.
+
 2002-11-06  Bruno Haible  <bruno@clisp.org>
 
 	* gcd.h (gcd): Change argument type to 'unsigned long'.
diff --git a/lib/strcspn.c b/lib/strcspn.c
index a84d4c41d..2bbd90664 100644
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,7 +1,7 @@
-/* Copyright (C) 1991, 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996-1997, 2002 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
-   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+   Bugs can be reported to bug-glibc@gnu.org.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -22,6 +22,8 @@
 # include <config.h>
 #endif
 
+#include <stddef.h>
+
 #if defined _LIBC || HAVE_STRING_H
 # include <string.h>
 #else
@@ -35,15 +37,13 @@
 
 /* Return the length of the maximum initial segment of S
    which contains no characters from REJECT.  */
-int
-strcspn (s, reject)
-     const char *s;
-     const char *reject;
+size_t
+strcspn (const char *s, const char *reject)
 {
-  int count = 0;
+  size_t count = 0;
 
   while (*s != '\0')
-    if (strchr (reject, *s++) == 0)
+    if (strchr (reject, *s++) == NULL)
       ++count;
     else
       return count;
diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index 6ed62a63c..01d8df5a8 100644
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 2000, 2002 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
@@ -16,11 +16,19 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-/* Find the first ocurrence in S of any character in ACCEPT.  */
+#include <stddef.h>
+
+#if defined _LIBC || HAVE_STRING_H
+# include <string.h>
+#endif
+
+#undef strpbrk
+
+/* Find the first occurrence in S of any character in ACCEPT.  */
 char *
 strpbrk (const char *s, const char *accept)
 {
@@ -33,5 +41,5 @@ strpbrk (const char *s, const char *accept)
       ++s;
     }
 
-  return 0;
+  return NULL;
 }
diff --git a/lib/strstr.c b/lib/strstr.c
index c41e90349..42ffcfa8e 100644
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1999, 2002 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #if defined _LIBC || defined HAVE_STRING_H
 # include <string.h>
 #endif
-#include <sys/types.h>
 
 typedef unsigned chartype;