diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-23 14:18:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-23 14:18:24 -0700 |
| commit | 2ad6ba353aa3815894674a0dee56aa75f8a5fc7b (patch) | |
| tree | 344307752bbd6c01d424e03eb7a4481012d4bde4 /http-fetch.c | |
| parent | Merge branch 'master' into js/c-merge-recursive (diff) | |
| parent | Convert memset(hash,0,20) to hashclr(hash). (diff) | |
| download | git-2ad6ba353aa3815894674a0dee56aa75f8a5fc7b.tar.gz git-2ad6ba353aa3815894674a0dee56aa75f8a5fc7b.zip | |
Merge branch 'gl/cleanup' into gl/cleanup-next
* gl/cleanup: (160 commits)
Convert memset(hash,0,20) to hashclr(hash).
Convert memcpy(a,b,20) to hashcpy(a,b).
Fix a comparison bug in diff-delta.c
git-send-email: Don't set author_not_sender from Cc: lines
Remove unnecessary forward declaration of unpack_entry.
Verify we know how to read a pack before trying to using it.
Add write_or_die(), a helper function
Axe the last ent
builtin-mv: readability patch
git-mv: fix off-by-one error
git-mv: special case destination "."
builtin-mv: readability patch
Indentation fix.
Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
gitweb: Uniquify version info output, add meta generator in page header
Be nicer if git executable is not installed
builtin-grep: remove unused debugging cruft.
gitweb: Add support for per project git URLs
[PATCH] git-mv: add more path normalization
Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
...
Diffstat (limited to 'http-fetch.c')
| -rw-r--r-- | http-fetch.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/http-fetch.c b/http-fetch.c index de5fc44e66..7619b338fe 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -36,10 +36,10 @@ enum XML_Status { #define PREV_BUF_SIZE 4096 #define RANGE_HEADER_SIZE 30 -static int commits_on_stdin = 0; +static int commits_on_stdin; static int got_alternates = -1; -static int corrupt_object_found = 0; +static int corrupt_object_found; static struct curl_slist *no_pragma_header; @@ -52,7 +52,7 @@ struct alt_base struct alt_base *next; }; -static struct alt_base *alt = NULL; +static struct alt_base *alt; enum object_request_state { WAITING, @@ -114,7 +114,7 @@ struct remote_ls_ctx }; #endif -static struct object_request *object_queue_head = NULL; +static struct object_request *object_queue_head; static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb, void *data) @@ -301,7 +301,7 @@ static void finish_object_request(struct object_request *obj_req) unlink(obj_req->tmpfile); return; } - if (memcmp(obj_req->sha1, obj_req->real_sha1, 20)) { + if (hashcmp(obj_req->sha1, obj_req->real_sha1)) { unlink(obj_req->tmpfile); return; } @@ -393,7 +393,7 @@ void prefetch(unsigned char *sha1) char *filename = sha1_file_name(sha1); newreq = xmalloc(sizeof(*newreq)); - memcpy(newreq->sha1, sha1, 20); + hashcpy(newreq->sha1, sha1); newreq->repo = alt; newreq->url = NULL; newreq->local = -1; @@ -1070,7 +1070,7 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1) int ret = 0; struct object_request *obj_req = object_queue_head; - while (obj_req != NULL && memcmp(obj_req->sha1, sha1, 20)) + while (obj_req != NULL && hashcmp(obj_req->sha1, sha1)) obj_req = obj_req->next; if (obj_req == NULL) return error("Couldn't find request for %s in the queue", hex); @@ -1109,7 +1109,7 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1) } else if (obj_req->zret != Z_STREAM_END) { corrupt_object_found++; ret = error("File %s (%s) corrupt", hex, obj_req->url); - } else if (memcmp(obj_req->sha1, obj_req->real_sha1, 20)) { + } else if (hashcmp(obj_req->sha1, obj_req->real_sha1)) { ret = error("File %s has bad hash", hex); } else if (obj_req->rename < 0) { ret = error("unable to write sha1 filename %s", |
