Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/ssh-upload.c b/ssh-upload.c
index 2f045727875707198dd1763d75c9e8c7406e9042..20c35f03dd1fb468c7cecc71f91951657f229f5e 100644 (file)
--- a/ssh-upload.c
+++ b/ssh-upload.c
@@ -29,24 +29,24 @@ static int serve_object(int fd_in, int fd_out) {
        }
        if (!size)
                return -1;
-       
+
        if (verbose)
                fprintf(stderr, "Serving %s\n", sha1_to_hex(sha1));
 
        remote = 0;
-       
+
        if (!has_sha1_file(sha1)) {
                fprintf(stderr, "git-ssh-upload: could not find %s\n",
                        sha1_to_hex(sha1));
                remote = -1;
        }
-       
+
        if (write_in_full(fd_out, &remote, 1) != 1)
                return 0;
-       
+
        if (remote < 0)
                return 0;
-       
+
        return write_sha1_to_fd(fd_out, sha1);
 }
 
@@ -86,7 +86,7 @@ static int serve_ref(int fd_in, int fd_out)
 
 static void service(int fd_in, int fd_out) {
        char type;
-       int retval;
+       ssize_t retval;
        do {
                retval = xread(fd_in, &type, 1);
                if (retval < 1) {