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 /utfutf.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 'utfutf.c')
-rw-r--r-- | utfutf.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -7,24 +7,25 @@ * 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" /* * Return pointer to first occurrence of s2 in s1, * 0 if none */ +const char* -utfutf(char *s1, char *s2) +utfutf(const char *s1, const char *s2) { - char *p; + const char *p; long f, n1, n2; Rune r; @@ -34,7 +35,7 @@ utfutf(char *s1, char *s2) return strstr(s1, s2); n2 = strlen(s2); - for(p=s1; p=utfrune(p, f); p+=n1) + for(p=s1; (p=utfrune(p, f)) != 0; p+=n1) if(strncmp(p, s2, n2) == 0) return p; return 0; |