From fa8d786628cd8a1dbd2194e7776bea07f97cca99 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 28 Jul 2010 00:53:16 +0200 Subject: [PATCH] mbspcasecmp: Fix function specification. --- ChangeLog | 7 +++++++ lib/mbspcasecmp.c | 11 +++++------ lib/string.in.h | 9 ++++----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 897387c6a..481acd5f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-07-27 Bruno Haible + + mbspcasecmp: Fix function specification. + * lib/string.in.h (mbspcasecmp): Fix specification comment. + * lib/mbspcasecmp.c (mbspcasecmp): Likewise. + Reported by Eric Blake . + 2010-07-26 Paul R. Eggert timespec: use cast and not conditional, as truncation isn't possible diff --git a/lib/mbspcasecmp.c b/lib/mbspcasecmp.c index 8975c952a..470088415 100644 --- a/lib/mbspcasecmp.c +++ b/lib/mbspcasecmp.c @@ -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 , 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) { diff --git a/lib/string.in.h b/lib/string.in.h index ca907b595..fb7377006 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -770,11 +770,10 @@ _GL_EXTERN_C int mbsncasecmp (const char *s1, const char *s2, size_t n) #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) -- 2.11.0