X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmbsncasecmp.c;h=12c7247ad270b0a8de9db6afbef52bf0f59a315c;hb=46f482ed7eed0b034b88c0f6b8a546f668d20321;hp=4c8c5a55c92d3a3ca4e9b5bd3db8f7d7b08480e8;hpb=4eda4ba54f3cf29f6b7fe4458e719cd2325be4c4;p=gnulib.git diff --git a/lib/mbsncasecmp.c b/lib/mbsncasecmp.c index 4c8c5a55c..12c7247ad 100644 --- a/lib/mbsncasecmp.c +++ b/lib/mbsncasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2008 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2010 Free Software Foundation, Inc. Written by Bruno Haible , 2005, based on earlier glibc code. @@ -53,24 +53,24 @@ mbsncasecmp (const char *s1, const char *s2, size_t n) 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)) - /* s2 terminated before s1 and n. */ - return 1; + /* s2 terminated before s1 and n. */ + return 1; if (mbui_avail (iter2)) - /* s1 terminated before s2 and n. */ - return -1; + /* s1 terminated before s2 and n. */ + return -1; return 0; } else @@ -80,20 +80,20 @@ mbsncasecmp (const char *s1, const char *s2, size_t n) 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) - return c1 - c2; + return c1 - c2; 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); } }