projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: update copyright
[gnulib.git]
/
lib
/
unistr
/
u8-chr.c
diff --git
a/lib/unistr/u8-chr.c
b/lib/unistr/u8-chr.c
index
46a3bd2
..
8b88538
100644
(file)
--- a/
lib/unistr/u8-chr.c
+++ b/
lib/unistr/u8-chr.c
@@
-1,5
+1,5
@@
/* Search character in piece of UTF-8 string.
/* Search character in piece of UTF-8 string.
- Copyright (C) 1999, 2002, 2006-2007, 2009-201
0
Free Software Foundation,
+ Copyright (C) 1999, 2002, 2006-2007, 2009-201
4
Free Software Foundation,
Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
@@
-21,6
+21,8
@@
/* Specification. */
#include "unistr.h"
/* Specification. */
#include "unistr.h"
+#include <string.h>
+
uint8_t *
u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
{
uint8_t *
u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
{
@@
-68,14
+70,17
@@
u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
uint8_t c1 = c[1];
const uint8_t *end = s + n - 1;
uint8_t c1 = c[1];
const uint8_t *end = s + n - 1;
- while (s < end)
+ do
{
{
+ /* Here s < end.
+ Test whether s[0..1] == { c0, c1 }. */
uint8_t s1 = s[1];
if (s1 == c1)
{
if (*s == c0)
return (uint8_t *) s;
else
uint8_t s1 = s[1];
if (s1 == c1)
{
if (*s == c0)
return (uint8_t *) s;
else
+ /* Skip the search at s + 1, because s[1] = c1 < c0. */
s += 2;
}
else
s += 2;
}
else
@@
-83,9
+88,11
@@
u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
if (s1 == c0)
s++;
else
if (s1 == c0)
s++;
else
+ /* Skip the search at s + 1, because s[1] != c0. */
s += 2;
}
}
s += 2;
}
}
+ while (s < end);
break;
}
break;
}
@@
-95,21
+102,26
@@
u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
uint8_t c1 = c[1];
uint8_t c2 = c[2];
const uint8_t *end = s + n - 2;
uint8_t c1 = c[1];
uint8_t c2 = c[2];
const uint8_t *end = s + n - 2;
- size_t skip;
+
size_t skip;
- if (c2 == c1)
+
if (c2 == c1)
skip = 1;
else
skip = 3;
skip = 1;
else
skip = 3;
- while (s < end)
+ do
{
{
+ /* Here s < end.
+ Test whether s[0..2] == { c0, c1, c2 }. */
uint8_t s2 = s[2];
if (s2 == c2)
{
if (s[1] == c1 && *s == c0)
return (uint8_t *) s;
else
uint8_t s2 = s[2];
if (s2 == c2)
{
if (s[1] == c1 && *s == c0)
return (uint8_t *) s;
else
+ /* If c2 != c1:
+ Skip the search at s + 1, because s[2] == c2 != c1.
+ Skip the search at s + 2, because s[2] == c2 < c0. */
s += skip;
}
else
s += skip;
}
else
@@
-117,11
+129,15
@@
u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
if (s2 == c1)
s++;
else if (s2 == c0)
if (s2 == c1)
s++;
else if (s2 == c0)
+ /* Skip the search at s + 1, because s[2] != c1. */
s += 2;
else
s += 2;
else
+ /* Skip the search at s + 1, because s[2] != c1.
+ Skip the search at s + 2, because s[2] != c0. */
s += 3;
}
}
s += 3;
}
}
+ while (s < end);
break;
}
break;
}
@@
-134,21
+150,28
@@
u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
const uint8_t *end = s + n - 3;
size_t skip;
const uint8_t *end = s + n - 3;
size_t skip;
- if (c3 == c2)
+
if (c3 == c2)
skip = 1;
else if (c3 == c1)
skip = 2;
else
skip = 4;
skip = 1;
else if (c3 == c1)
skip = 2;
else
skip = 4;
- while (s < end)
+ do
{
{
+ /* Here s < end.
+ Test whether s[0..3] == { c0, c1, c2, c3 }. */
uint8_t s3 = s[3];
if (s3 == c3)
{
if (s[2] == c2 && s[1] == c1 && *s == c0)
return (uint8_t *) s;
else
uint8_t s3 = s[3];
if (s3 == c3)
{
if (s[2] == c2 && s[1] == c1 && *s == c0)
return (uint8_t *) s;
else
+ /* If c3 != c2:
+ Skip the search at s + 1, because s[3] == c3 != c2.
+ If c3 != c1:
+ Skip the search at s + 2, because s[3] == c3 != c1.
+ Skip the search at s + 3, because s[3] == c3 < c0. */
s += skip;
}
else
s += skip;
}
else
@@
-156,13
+179,20
@@
u8_chr (const uint8_t *s, size_t n, ucs4_t uc)
if (s3 == c2)
s++;
else if (s3 == c1)
if (s3 == c2)
s++;
else if (s3 == c1)
+ /* Skip the search at s + 1, because s[3] != c2. */
s += 2;
else if (s3 == c0)
s += 2;
else if (s3 == c0)
+ /* Skip the search at s + 1, because s[3] != c2.
+ Skip the search at s + 2, because s[3] != c1. */
s += 3;
else
s += 3;
else
+ /* Skip the search at s + 1, because s[3] != c2.
+ Skip the search at s + 2, because s[3] != c1.
+ Skip the search at s + 3, because s[3] != c0. */
s += 4;
}
}
s += 4;
}
}
+ while (s < end);
break;
}
}
break;
}
}