projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strerror_r: Fix test failure on mingw.
[gnulib.git]
/
lib
/
unistr
/
u16-strchr.c
diff --git
a/lib/unistr/u16-strchr.c
b/lib/unistr/u16-strchr.c
index
673152f
..
028a94d
100644
(file)
--- a/
lib/unistr/u16-strchr.c
+++ b/
lib/unistr/u16-strchr.c
@@
-1,5
+1,6
@@
/* Search character in UTF-16 string.
/* Search character in UTF-16 string.
- Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2006-2007, 2009-2011 Free Software Foundation,
+ Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software: you can redistribute it and/or modify it
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software: you can redistribute it and/or modify it
@@
-30,33
+31,33
@@
u16_strchr (const uint16_t *s, ucs4_t uc)
uint16_t c0 = uc;
for (;; s++)
uint16_t c0 = uc;
for (;; s++)
- {
- if (*s == c0)
- break;
- if (*s == 0)
- goto notfound;
- }
+
{
+
if (*s == c0)
+
break;
+
if (*s == 0)
+
goto notfound;
+
}
return (uint16_t *) s;
}
else
switch (u16_uctomb_aux (c, uc, 2))
{
case 2:
return (uint16_t *) s;
}
else
switch (u16_uctomb_aux (c, uc, 2))
{
case 2:
- if (*s == 0)
- goto notfound;
- {
- uint16_t c0 = c[0];
- uint16_t c1 = c[1];
-
- for (;; s++)
- {
- if (s[1] == 0)
- goto notfound;
- if (*s == c0 && s[1] == c1)
- break;
- }
- return (uint16_t *) s;
- }
+
if (*s == 0)
+
goto notfound;
+
{
+
uint16_t c0 = c[0];
+
uint16_t c1 = c[1];
+
+
for (;; s++)
+
{
+
if (s[1] == 0)
+
goto notfound;
+
if (*s == c0 && s[1] == c1)
+
break;
+
}
+
return (uint16_t *) s;
+
}
}
notfound:
return NULL;
}
notfound:
return NULL;