Mercurial > gnulib
changeset 33169:d302653de4f8
mbspcasecmp: Fix function specification.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Wed, 28 Jul 2010 00:53:16 +0200 |
| parents | 327dd1fc5ed1 |
| children | 9de417564836 |
| files | ChangeLog lib/mbspcasecmp.c lib/string.in.h |
| diffstat | 3 files changed, 16 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jul 27 07:22:56 2010 -0700 +++ b/ChangeLog Wed Jul 28 00:53:16 2010 +0200 @@ -1,3 +1,10 @@ +2010-07-27 Bruno Haible <bruno@clisp.org> + + mbspcasecmp: Fix function specification. + * lib/string.in.h (mbspcasecmp): Fix specification comment. + * lib/mbspcasecmp.c (mbspcasecmp): Likewise. + Reported by Eric Blake <eblake@redhat.com>. + 2010-07-26 Paul R. Eggert <eggert@cs.ucla.edu> timespec: use cast and not conditional, as truncation isn't possible
--- a/lib/mbspcasecmp.c Tue Jul 27 07:22:56 2010 -0700 +++ b/lib/mbspcasecmp.c Wed Jul 28 00:53:16 2010 +0200 @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2010 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2008, 2010 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This program is free software: you can redistribute it and/or modify @@ -28,11 +28,10 @@ /* Compare the initial segment of the character string STRING consisting of at most mbslen (PREFIX) characters with the character string PREFIX, - ignoring case, returning less than, equal to or greater than zero if this - initial segment is lexicographically less than, equal to or greater than - PREFIX. - Note: This function may, in multibyte locales, return 0 if STRING is of - smaller length than PREFIX! */ + ignoring case. If the two match, return a pointer to the first byte + after this prefix in STRING. Otherwise, return NULL. + Note: This function may, in multibyte locales, return non-NULL if STRING + is of smaller length than PREFIX! */ char * mbspcasecmp (const char *string, const char *prefix) {
--- a/lib/string.in.h Tue Jul 27 07:22:56 2010 -0700 +++ b/lib/string.in.h Wed Jul 28 00:53:16 2010 +0200 @@ -770,11 +770,10 @@ #if @GNULIB_MBSPCASECMP@ /* Compare the initial segment of the character string STRING consisting of at most mbslen (PREFIX) characters with the character string PREFIX, - ignoring case, returning less than, equal to or greater than zero if this - initial segment is lexicographically less than, equal to or greater than - PREFIX. - Note: This function may, in multibyte locales, return 0 if STRING is of - smaller length than PREFIX! + ignoring case. If the two match, return a pointer to the first byte + after this prefix in STRING. Otherwise, return NULL. + Note: This function may, in multibyte locales, return non-NULL if STRING + is of smaller length than PREFIX! Unlike strncasecmp(), this function works correctly in multibyte locales. */ _GL_EXTERN_C char * mbspcasecmp (const char *string, const char *prefix)