Replace index() with strchr().

strchr() is more portable than index() and is used everywhere in
git already.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/http-fetch.c b/http-fetch.c
index 71a7dafd696d0da3a9662fb19cd83f87df1ec9b4..861644b27ee0c01a780b68daa43c259dd978a538 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -597,7 +597,7 @@ static void process_alternates_response(void *callback_data)
                                newalt->packs = NULL;
                                path = strstr(target, "//");
                                if (path) {
                                newalt->packs = NULL;
                                path = strstr(target, "//");
                                if (path) {

-                                       path = index(path+2, '/');
+                                       path = strchr(path+2, '/');

                                        if (path)
                                                newalt->path_len = strlen(path);
                                }
                                        if (path)
                                                newalt->path_len = strlen(path);
                                }


@@ -678,7 +678,7 @@ static void
 xml_start_tag(void *userData, const char *name, const char **atts)
 {
        struct xml_ctx *ctx = (struct xml_ctx *)userData;
 xml_start_tag(void *userData, const char *name, const char **atts)
 {
        struct xml_ctx *ctx = (struct xml_ctx *)userData;

-       const char *c = index(name, ':');
+       const char *c = strchr(name, ':');

        int new_len;
 
        if (c == NULL)
        int new_len;
 
        if (c == NULL)


@@ -707,7 +707,7 @@ static void
 xml_end_tag(void *userData, const char *name)
 {
        struct xml_ctx *ctx = (struct xml_ctx *)userData;
 xml_end_tag(void *userData, const char *name)
 {
        struct xml_ctx *ctx = (struct xml_ctx *)userData;

-       const char *c = index(name, ':');
+       const char *c = strchr(name, ':');

        char *ep;
 
        ctx->userFunc(ctx, 1);
        char *ep;
 
        ctx->userFunc(ctx, 1);


@@ -1261,7 +1261,7 @@ int main(int argc, char **argv)
        alt->next = NULL;
        path = strstr(url, "//");
        if (path) {
        alt->next = NULL;
        path = strstr(url, "//");
        if (path) {

-               path = index(path+2, '/');
+               path = strchr(path+2, '/');

                if (path)
                        alt->path_len = strlen(path);
        }
                if (path)
                        alt->path_len = strlen(path);
        }

diff --git a/http-push.c b/http-push.c
index 57cefdea530171c71c72229a85aa0212dedb2c5a..994ee90035c4ae5e055df79cea8621d294190a3f 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1211,7 +1211,7 @@ static void
 xml_start_tag(void *userData, const char *name, const char **atts)
 {
        struct xml_ctx *ctx = (struct xml_ctx *)userData;
 xml_start_tag(void *userData, const char *name, const char **atts)
 {
        struct xml_ctx *ctx = (struct xml_ctx *)userData;

-       const char *c = index(name, ':');
+       const char *c = strchr(name, ':');

        int new_len;
 
        if (c == NULL)
        int new_len;
 
        if (c == NULL)


@@ -1240,7 +1240,7 @@ static void
 xml_end_tag(void *userData, const char *name)
 {
        struct xml_ctx *ctx = (struct xml_ctx *)userData;
 xml_end_tag(void *userData, const char *name)
 {
        struct xml_ctx *ctx = (struct xml_ctx *)userData;

-       const char *c = index(name, ':');
+       const char *c = strchr(name, ':');

        char *ep;
 
        ctx->userFunc(ctx, 1);
        char *ep;
 
        ctx->userFunc(ctx, 1);


@@ -2350,7 +2350,7 @@ int main(int argc, char **argv)
                        char *path = strstr(arg, "//");
                        remote->url = arg;
                        if (path) {
                        char *path = strstr(arg, "//");
                        remote->url = arg;
                        if (path) {

-                               path = index(path+2, '/');
+                               path = strchr(path+2, '/');

                                if (path)
                                        remote->path_len = strlen(path);
                        }
                                if (path)
                                        remote->path_len = strlen(path);
                        }