diff options
| author | Bruno Haible <bruno@clisp.org> | 2003-01-15 12:45:54 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2003-01-15 12:45:54 +0000 |
| commit | 6a638f79ae2db9683afa6925c4ca61e0b29614f0 (patch) | |
| tree | 0ee0813ce8b09cece19fbb3f2e689eb848f76288 | |
| parent | 450606da89c4c3fc8048f7f57b9e47d2217ca49f (diff) | |
| download | gnulib-6a638f79ae2db9683afa6925c4ca61e0b29614f0.tar.gz | |
Use ANSI C function declarations.
| -rw-r--r-- | lib/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/stpcpy.h | 13 | ||||
| -rw-r--r-- | lib/strcase.h | 24 |
3 files changed, 20 insertions, 22 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 7f94783d70..44064404dd 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2003-01-11 Bruno Haible <bruno@clisp.org> + + * stpcpy.h (stpcpy): Use ANSI C function declarations. + * strcase.h (strcasecmp, strncasecmp): Likewise. + 2003-01-14 Jim Meyering <jim@meyering.net> * same.c (same_name): Tweak a comment. diff --git a/lib/stpcpy.h b/lib/stpcpy.h index ce8fe0ec47..b579c5c9de 100644 --- a/lib/stpcpy.h +++ b/lib/stpcpy.h @@ -1,5 +1,5 @@ /* String copying. - Copyright (C) 1995, 2001 Free Software Foundation, Inc. + Copyright (C) 1995, 2001, 2003 Free Software Foundation, Inc. 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 @@ -18,14 +18,6 @@ #ifndef _STPCPY_H #define _STPCPY_H -#ifndef PARAMS -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - #if HAVE_STPCPY /* Get stpcpy() declaration. */ @@ -33,7 +25,8 @@ #else -extern char *stpcpy PARAMS ((char *__dst, const char *__src)); +/* Copy SRC to DST, returning the address of the terminating '\0' in DST. */ +extern char *stpcpy (char *dst, const char *src); #endif diff --git a/lib/strcase.h b/lib/strcase.h index be2d0dd718..f17e64832f 100644 --- a/lib/strcase.h +++ b/lib/strcase.h @@ -1,5 +1,5 @@ /* Case-insensitive string comparison functions. - Copyright (C) 1995-1996, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001, 2003 Free Software Foundation, Inc. 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 @@ -20,16 +20,16 @@ #include <stddef.h> -#ifndef PARAMS -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES -# define PARAMS(args) args -# else -# define PARAMS(args) () -# endif -#endif - -extern int strcasecmp PARAMS ((const char *__s1, const char *__s2)); -extern int strncasecmp PARAMS ((const char *__s1, const char *__s2, - size_t __n)); +/* Compare strings S1 and S2, ignoring case, returning less than, equal to or + greater than zero if S1 is lexicographically less than, equal to or greater + than S2. + Note: This function does not work correctly in multibyte locales. */ +extern int strcasecmp (const char *s1, const char *s2); + +/* Compare no more than N characters of strings S1 and S2, ignoring case, + returning less than, equal to or greater than zero if S1 is + lexicographically less than, equal to or greater than S2. + Note: This function can not work correctly in multibyte locales. */ +extern int strncasecmp (const char *s1, const char *s2, size_t n); #endif /* _STRCASE_H */ |