Mercurial > hg > octave-lojdl > gnulib-hg
changeset 3975:e34e6bd35c66
Minimize diffs to glibc. Modernize.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 15 Nov 2002 17:36:03 +0000 |
| parents | 374be83da43b |
| children | df9c91af417b |
| files | lib/ChangeLog lib/strcspn.c lib/strpbrk.c lib/strstr.c |
| diffstat | 4 files changed, 34 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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'.
--- 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;
--- 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 @@ ++s; } - return 0; + return NULL; }
--- 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 @@ #if defined _LIBC || defined HAVE_STRING_H # include <string.h> #endif -#include <sys/types.h> typedef unsigned chartype;