X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=ssh-fetch.c;h=b006c5c9802d96bc504188e10a9698a1f943477c;hb=eb153837d8509fc6ef59b17630429c63c0993b2d;hp=c7d8fa80e425695374f11746ae6592f52d8401d5;hpb=67e31d6234c0332334d7aedd70b2f101bc010cf9;p=git.git diff --git a/ssh-fetch.c b/ssh-fetch.c index c7d8fa80e..b006c5c98 100644 --- a/ssh-fetch.c +++ b/ssh-fetch.c @@ -17,7 +17,7 @@ static int fd_in; static int fd_out; -static unsigned char remote_version = 0; +static unsigned char remote_version; static unsigned char local_version = 1; static ssize_t force_write(int fd, void *buffer, size_t length) @@ -36,9 +36,9 @@ static ssize_t force_write(int fd, void *buffer, size_t length) return ret; } -static int prefetches = 0; +static int prefetches; -static struct object_list *in_transit = NULL; +static struct object_list *in_transit; static struct object_list **end_of_transit = &in_transit; void prefetch(unsigned char *sha1) @@ -59,7 +59,7 @@ void prefetch(unsigned char *sha1) } static char conn_buf[4096]; -static size_t conn_buf_posn = 0; +static size_t conn_buf_posn; int fetch(unsigned char *sha1) { @@ -67,7 +67,7 @@ int fetch(unsigned char *sha1) signed char remote; struct object_list *temp; - if (memcmp(sha1, in_transit->item->sha1, 20)) { + if (hashcmp(sha1, in_transit->item->sha1)) { /* we must have already fetched it to clean the queue */ return has_sha1_file(sha1) ? 0 : -1; }