diff options
author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-20 02:22:50 +0000 |
---|---|---|
committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-20 02:22:50 +0000 |
commit | 64c8c730d752e90591b44384ef4663fa06db4213 (patch) | |
tree | 35a33ab64f63da4a5d225cc309b8cee56b2e45cb /missing | |
parent | 7f60c0289c1e682b622610ca9d36ded21356f532 (diff) | |
download | bundler-64c8c730d752e90591b44384ef4663fa06db4213.tar.gz |
* eval.c, file.c, ruby.c: removed strchr, strrchr, strstr definition
because they are defined in missing.h.
* missing.h, missing/strchr.c, missing/strstr.c: ANSI styled.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'missing')
-rw-r--r-- | missing/strchr.c | 18 | ||||
-rw-r--r-- | missing/strstr.c | 11 |
2 files changed, 12 insertions, 17 deletions
diff --git a/missing/strchr.c b/missing/strchr.c index 886d70ede6..bebd7ba578 100644 --- a/missing/strchr.c +++ b/missing/strchr.c @@ -1,32 +1,28 @@ /* public domain rewrite of strchr(3) and strrchr(3) */ char * -strchr(s, c) - char *s; - int c; +strchr(const char *s, int c) { - if (c == 0) return s + strlen(s); + if (c == 0) return (char *)s + strlen(s); while (*s) { if (*s == c) - return s; + return (char *)s; s++; } return 0; } char * -strrchr(s, c) - char *s; - int c; +strrchr(const char *s, int c) { - char *save; + const char *save; - if (c == 0) return s + strlen(s); + if (c == 0) return (char *)s + strlen(s); save = 0; while (*s) { if (*s == c) save = s; s++; } - return save; + return (char *)save; } diff --git a/missing/strstr.c b/missing/strstr.c index 1673518f06..2e9c282fb1 100644 --- a/missing/strstr.c +++ b/missing/strstr.c @@ -1,20 +1,19 @@ /* public domain rewrite of strstr(3) */ char * -strstr(haystack, needle) - char *haystack, *needle; +strstr(const char *haystack, const char *needle) { - char *hend; - char *a, *b; + const char *hend; + const char *a, *b; - if (*needle == 0) return haystack; + if (*needle == 0) return (char *)haystack; hend = haystack + strlen(haystack) - strlen(needle) + 1; while (haystack < hend) { if (*haystack == *needle) { a = haystack; b = needle; for (;;) { - if (*b == 0) return haystack; + if (*b == 0) return (char *)haystack; if (*a++ != *b++) { break; } |