projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'snapshot-start' into stable
[gnulib.git]
/
lib
/
unistr
/
u16-chr.c
diff --git
a/lib/unistr/u16-chr.c
b/lib/unistr/u16-chr.c
index
2d7d797
..
d9d44d1
100644
(file)
--- a/
lib/unistr/u16-chr.c
+++ b/
lib/unistr/u16-chr.c
@@
-1,5
+1,6
@@
/* Search character in piece of UTF-16 string.
/* Search character in piece of UTF-16 string.
- Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2006-2007, 2009-2014 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,27
+31,27
@@
u16_chr (const uint16_t *s, size_t n, ucs4_t uc)
uint16_t c0 = uc;
for (; n > 0; s++, n--)
uint16_t c0 = uc;
for (; n > 0; s++, n--)
- {
- if (*s == c0)
- return (uint16_t *) s;
- }
+
{
+
if (*s == c0)
+
return (uint16_t *) s;
+
}
}
else
switch (u16_uctomb_aux (c, uc, 2))
{
case 2:
}
else
switch (u16_uctomb_aux (c, uc, 2))
{
case 2:
- if (n > 1)
- {
- uint16_t c0 = c[0];
- uint16_t c1 = c[1];
-
- for (n--; n > 0; s++, n--)
- {
- if (*s == c0 && s[1] == c1)
- return (uint16_t *) s;
- }
- }
- break;
+
if (n > 1)
+
{
+
uint16_t c0 = c[0];
+
uint16_t c1 = c[1];
+
+
for (n--; n > 0; s++, n--)
+
{
+
if (*s == c0 && s[1] == c1)
+
return (uint16_t *) s;
+
}
+
}
+
break;
}
return NULL;
}
}
return NULL;
}