diff options
| author | Alexander Gutkin <agutkin@google.com> | 2014-03-04 17:22:31 +0000 |
|---|---|---|
| committer | Alexander Gutkin <agutkin@google.com> | 2014-03-04 17:22:31 +0000 |
| commit | 96039b7897bb8b5853e91404d97abca72d933c69 (patch) | |
| tree | 67f53abddaf6561b9d8389f94e31774caecb77e7 /runestrncat.c | |
| parent | 439f3d1f87279a8be383ee01ef98cb9a5ca68573 (diff) | |
| download | libutf-96039b7897bb8b5853e91404d97abca72d933c69.tar.gz | |
Updating libutf to a newer version.
This brings us in sync with the google3 //third_party/utf
implementation.
Change-Id: I0f3e013304bab6d609ddf0b2619f3b5b8ec6f047
Diffstat (limited to 'runestrncat.c')
| -rw-r--r-- | runestrncat.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runestrncat.c b/runestrncat.c index 9653637..3ad827e 100644 --- a/runestrncat.c +++ b/runestrncat.c @@ -7,23 +7,23 @@ * or modification of this software and in all copies of the supporting * documentation for such software. * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE - * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY + * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY + * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. */ #include <stdarg.h> #include <string.h> -#include "plan9.h" #include "utf.h" +#include "utfdef.h" Rune* -runestrncat(Rune *s1, Rune *s2, long n) +runestrncat(Rune *s1, const Rune *s2, long n) { Rune *os1; os1 = s1; - s1 = runestrchr(s1, 0); - while(*s1++ = *s2++) + s1 = (Rune*)runestrchr(s1, 0); + while((*s1++ = *s2++) != 0) if(--n < 0) { s1[-1] = 0; break; |