projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
c-stack: stop worrying about stack direction
[gnulib.git]
/
lib
/
unistr
/
u-strspn.h
diff --git
a/lib/unistr/u-strspn.h
b/lib/unistr/u-strspn.h
index
6502ce4
..
c414576
100644
(file)
--- a/
lib/unistr/u-strspn.h
+++ b/
lib/unistr/u-strspn.h
@@
-1,5
+1,5
@@
/* Search for some characters in UTF-8/UTF-16/UTF-32 string.
/* Search for some characters in UTF-8/UTF-16/UTF-32 string.
- Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2006
, 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
@@
-26,11
+26,11
@@
FUNC (const UNIT *str, const UNIT *accept)
int count = U_STRMBTOUC (&uc, accept);
if (count >= 0 && accept[count] == 0)
{
int count = U_STRMBTOUC (&uc, accept);
if (count >= 0 && accept[count] == 0)
{
- const UNIT *ptr = str;
- for (; *ptr != 0; ptr += count)
- if (U_CMP (ptr, accept, count) != 0)
- break;
- return ptr - str;
+
const UNIT *ptr = str;
+
for (; *ptr != 0; ptr += count)
+
if (U_CMP (ptr, accept, count) != 0)
+
break;
+
return ptr - str;
}
}
/* General case. */
}
}
/* General case. */
@@
-39,15
+39,15
@@
FUNC (const UNIT *str, const UNIT *accept)
for (;;)
{
for (;;)
{
- ucs4_t uc;
- int count = U_STRMBTOUC (&uc, ptr);
- if (count == 0)
- return ptr - str;
- if (count < 0)
- break;
- if (!U_STRCHR (accept, uc))
- return ptr - str;
- ptr += count;
+
ucs4_t uc;
+
int count = U_STRMBTOUC (&uc, ptr);
+
if (count == 0)
+
return ptr - str;
+
if (count < 0)
+
break;
+
if (!U_STRCHR (accept, uc))
+
return ptr - str;
+
ptr += count;
}
return U_STRLEN (str);
}
}
return U_STRLEN (str);
}