projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xgetcwd: Move AC_LIBOBJ invocations to module description.
[gnulib.git]
/
lib
/
unistr
/
u-strtok.h
diff --git
a/lib/unistr/u-strtok.h
b/lib/unistr/u-strtok.h
index
7ed57d6
..
763dcca
100644
(file)
--- a/
lib/unistr/u-strtok.h
+++ b/
lib/unistr/u-strtok.h
@@
-1,5
+1,5
@@
/* Tokenize UTF-8/UTF-16/UTF-32 string.
/* Tokenize 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
@@
-22,7
+22,7
@@
FUNC (UNIT *str, const UNIT *delim, UNIT **ptr)
{
str = *ptr;
if (str == NULL)
{
str = *ptr;
if (str == NULL)
- return NULL; /* reminder that end of token sequence has been reached */
+
return NULL; /* reminder that end of token sequence has been reached */
}
/* Skip leading delimiters. */
}
/* Skip leading delimiters. */
@@
-40,9
+40,9
@@
FUNC (UNIT *str, const UNIT *delim, UNIT **ptr)
UNIT *token_end = U_STRPBRK (str, delim);
if (token_end)
{
UNIT *token_end = U_STRPBRK (str, delim);
if (token_end)
{
- /* NUL-terminate the token. */
- *token_end = 0;
- *ptr = token_end + 1;
+
/* NUL-terminate the token. */
+
*token_end = 0;
+
*ptr = token_end + 1;
}
else
*ptr = NULL;
}
else
*ptr = NULL;