X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=http-push.c;h=7c3720f602bb8f50ed54a4f7e7a85c7e08d1c07b;hb=acef41c9db33f2261e46e17cca098df3403dd745;hp=cbb02d3bc1eef3d5a088be320a3a8bcb87a4a685;hpb=1589e0517fd22c198799504d6888d5a475024152;p=git.git

diff --git a/http-push.c b/http-push.c
index cbb02d3bc..7c3720f60 100644
--- a/http-push.c
+++ b/http-push.c
@@ -9,6 +9,7 @@
 #include "diff.h"
 #include "revision.h"
 #include "exec_cmd.h"
+#include "remote.h"
 
 #include <expat.h>
 
@@ -312,7 +313,7 @@ static void start_fetch_loose(struct transfer_request *request)
 		SHA1_Init(&request->c);
 		if (prev_posn>0) {
 			prev_posn = 0;
-			lseek(request->local_fileno, SEEK_SET, 0);
+			lseek(request->local_fileno, 0, SEEK_SET);
 			ftruncate(request->local_fileno, 0);
 		}
 	}
@@ -517,7 +518,7 @@ static void start_put(struct transfer_request *request)
 	request->buffer.size = stream.total_out;
 	request->buffer.posn = 0;
 
-	request->url = xmalloc(strlen(remote->url) + 
+	request->url = xmalloc(strlen(remote->url) +
 			       strlen(request->lock->token) + 51);
 	strcpy(request->url, remote->url);
 	posn = request->url + strlen(remote->url);
@@ -1750,8 +1751,7 @@ static struct object_list **process_tree(struct tree *tree,
 	me.elem = name;
 	me.elem_len = strlen(name);
 
-	desc.buf = tree->buffer;
-	desc.size = tree->size;
+	init_tree_desc(&desc, tree->buffer, tree->size);
 
 	while (tree_entry(&desc, &entry)) {
 		if (S_ISDIR(entry.mode))