projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strtok_r: Avoid triggering bug in AIX 7.1 xlc compiler.
[gnulib.git]
/
lib
/
mbsncasecmp.c
diff --git
a/lib/mbsncasecmp.c
b/lib/mbsncasecmp.c
index
51c606f
..
12c7247
100644
(file)
--- a/
lib/mbsncasecmp.c
+++ b/
lib/mbsncasecmp.c
@@
-1,12
+1,12
@@
/* Case-insensitive string comparison function.
/* Case-insensitive string comparison function.
- Copyright (C) 1998-1999, 2005-20
07
Free Software Foundation, Inc.
+ Copyright (C) 1998-1999, 2005-20
10
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2005,
based on earlier glibc code.
Written by Bruno Haible <bruno@clisp.org>, 2005,
based on earlier glibc code.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,8
+14,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
@@
-25,9
+24,7
@@
#include <ctype.h>
#include <limits.h>
#include <ctype.h>
#include <limits.h>
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
@@
-47,7
+44,6
@@
mbsncasecmp (const char *s1, const char *s2, size_t n)
/* Be careful not to look at the entire extent of s1 or s2 until needed.
This is useful because when two strings differ, the difference is
most often already in the very few first characters. */
/* Be careful not to look at the entire extent of s1 or s2 until needed.
This is useful because when two strings differ, the difference is
most often already in the very few first characters. */
-#if HAVE_MBRTOWC
if (MB_CUR_MAX > 1)
{
mbui_iterator_t iter1;
if (MB_CUR_MAX > 1)
{
mbui_iterator_t iter1;
@@
-57,48
+53,47
@@
mbsncasecmp (const char *s1, const char *s2, size_t n)
mbui_init (iter2, s2);
while (mbui_avail (iter1) && mbui_avail (iter2))
mbui_init (iter2, s2);
while (mbui_avail (iter1) && mbui_avail (iter2))
- {
- int cmp = mb_casecmp (mbui_cur (iter1), mbui_cur (iter2));
+
{
+
int cmp = mb_casecmp (mbui_cur (iter1), mbui_cur (iter2));
- if (cmp != 0)
- return cmp;
+
if (cmp != 0)
+
return cmp;
- if (--n == 0)
- return 0;
+
if (--n == 0)
+
return 0;
- mbui_advance (iter1);
- mbui_advance (iter2);
- }
+
mbui_advance (iter1);
+
mbui_advance (iter2);
+
}
if (mbui_avail (iter1))
if (mbui_avail (iter1))
- /* s2 terminated before s1 and n. */
- return 1;
+
/* s2 terminated before s1 and n. */
+
return 1;
if (mbui_avail (iter2))
if (mbui_avail (iter2))
- /* s1 terminated before s2 and n. */
- return -1;
+
/* s1 terminated before s2 and n. */
+
return -1;
return 0;
}
else
return 0;
}
else
-#endif
{
const unsigned char *p1 = (const unsigned char *) s1;
const unsigned char *p2 = (const unsigned char *) s2;
unsigned char c1, c2;
for (; ; p1++, p2++)
{
const unsigned char *p1 = (const unsigned char *) s1;
const unsigned char *p2 = (const unsigned char *) s2;
unsigned char c1, c2;
for (; ; p1++, p2++)
- {
- c1 = TOLOWER (*p1);
- c2 = TOLOWER (*p2);
+
{
+
c1 = TOLOWER (*p1);
+
c2 = TOLOWER (*p2);
- if (--n == 0 || c1 == '\0' || c1 != c2)
- break;
- }
+
if (--n == 0 || c1 == '\0' || c1 != c2)
+
break;
+
}
if (UCHAR_MAX <= INT_MAX)
if (UCHAR_MAX <= INT_MAX)
- return c1 - c2;
+
return c1 - c2;
else
else
- /* On machines where 'char' and 'int' are types of the same size, the
- difference of two 'unsigned char' values - including the sign bit -
- doesn't fit in an 'int'. */
- return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0);
+
/* On machines where 'char' and 'int' are types of the same size, the
+
difference of two 'unsigned char' values - including the sign bit -
+
doesn't fit in an 'int'. */
+
return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0);
}
}
}
}