Browse Source

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>
maint
Dennis Stosberg 19 years ago committed by Junio C Hamano
parent
commit
ef9e58c826
  1. 8
      http-fetch.c
  2. 6
      http-push.c

8
http-fetch.c

@ -597,7 +597,7 @@ static void process_alternates_response(void *callback_data) @@ -597,7 +597,7 @@ static void process_alternates_response(void *callback_data)
newalt->packs = NULL;
path = strstr(target, "//");
if (path) {
path = index(path+2, '/');
path = strchr(path+2, '/');
if (path)
newalt->path_len = strlen(path);
}
@ -678,7 +678,7 @@ static void @@ -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;
const char *c = index(name, ':');
const char *c = strchr(name, ':');
int new_len;

if (c == NULL)
@ -707,7 +707,7 @@ static void @@ -707,7 +707,7 @@ static void
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);
@ -1261,7 +1261,7 @@ int main(int argc, char **argv) @@ -1261,7 +1261,7 @@ int main(int argc, char **argv)
alt->next = NULL;
path = strstr(url, "//");
if (path) {
path = index(path+2, '/');
path = strchr(path+2, '/');
if (path)
alt->path_len = strlen(path);
}

6
http-push.c

@ -1211,7 +1211,7 @@ static void @@ -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;
const char *c = index(name, ':');
const char *c = strchr(name, ':');
int new_len;

if (c == NULL)
@ -1240,7 +1240,7 @@ static void @@ -1240,7 +1240,7 @@ static void
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);
@ -2350,7 +2350,7 @@ int main(int argc, char **argv) @@ -2350,7 +2350,7 @@ int main(int argc, char **argv)
char *path = strstr(arg, "//");
remote->url = arg;
if (path) {
path = index(path+2, '/');
path = strchr(path+2, '/');
if (path)
remote->path_len = strlen(path);
}

Loading…
Cancel
Save