summaryrefslogtreecommitdiff
path: root/lib/unistr/u-strcspn.h
diff options
context:
space:
mode:
authorAndreas Rottmann <a.rottmann@gmx.at>2010-05-27 18:23:17 +0200
committerAndreas Rottmann <a.rottmann@gmx.at>2010-05-27 18:23:17 +0200
commitbd6adfa17d453e4c486e36fed4c5779db90a8a0e (patch)
tree9798677560d5f99061afe9f0db105a8c97f2438a /lib/unistr/u-strcspn.h
parent79ca645d222db2e158784642c3b464a47bea26f3 (diff)
parent3e0814cd9862b89c7a39672672937477bd87ddfb (diff)
Merge commit 'upstream/0.9.3'
Diffstat (limited to 'lib/unistr/u-strcspn.h')
-rw-r--r--lib/unistr/u-strcspn.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/unistr/u-strcspn.h b/lib/unistr/u-strcspn.h
index de326563..77b95508 100644
--- a/lib/unistr/u-strcspn.h
+++ b/lib/unistr/u-strcspn.h
@@ -1,5 +1,5 @@
/* 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-2010 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
@@ -26,11 +26,11 @@ FUNC (const UNIT *str, const UNIT *reject)
int count = U_STRMBTOUC (&uc, reject);
if (count >= 0 && reject[count] == 0)
{
- const UNIT *found = U_STRCHR (str, uc);
- if (found != NULL)
- return found - str;
- else
- return U_STRLEN (str);
+ const UNIT *found = U_STRCHR (str, uc);
+ if (found != NULL)
+ return found - str;
+ else
+ return U_STRLEN (str);
}
}
/* General case. */
@@ -39,15 +39,15 @@ FUNC (const UNIT *str, const UNIT *reject)
for (;;)
{
- ucs4_t uc;
- int count = U_STRMBTOUC (&uc, ptr);
- if (count == 0)
- return ptr - str;
- if (count < 0)
- break;
- if (U_STRCHR (reject, 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 (reject, uc))
+ return ptr - str;
+ ptr += count;
}
return U_STRLEN (str);
}