[PATCH] Fix sparse warnings

fix one 'should it be static?' warning and
two 'mixing declarations and code' warnings.

Signed-off-by: Alecs King <alecsk@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/connect.c b/connect.c
index d913f296d3a153c377e88da10be46caed136d35d..a20af1ce0c5c006db6197c6cc9c6746d5c2ef66a 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -230,11 +230,9 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
                if (src->peer_ref)
                        continue;
                dst_peer = find_ref_by_name(dst, src->name);
                if (src->peer_ref)
                        continue;
                dst_peer = find_ref_by_name(dst, src->name);

-               if (dst_peer && dst_peer->peer_ref)
+               if ((dst_peer && dst_peer->peer_ref) || (!dst_peer && !all))

                        continue;
                if (!dst_peer) {
                        continue;
                if (!dst_peer) {

-                       if (!all)
-                               continue;

                        /* Create a new one and link it */
                        int len = strlen(src->name) + 1;
                        dst_peer = xcalloc(1, sizeof(*dst_peer) + len);
                        /* Create a new one and link it */
                        int len = strlen(src->name) + 1;
                        dst_peer = xcalloc(1, sizeof(*dst_peer) + len);

diff --git a/ssh-pull.c b/ssh-pull.c
index bdc99dfdc532755622e9cfc5688ee0bba9e705de..b7f313bf277fc2f2c2cfb84048cd077728da9dd9 100644 (file)
--- a/ssh-pull.c
+++ b/ssh-pull.c
@@ -10,7 +10,7 @@ static int fd_out;
 static unsigned char remote_version = 0;
 static unsigned char local_version = 1;
 
 static unsigned char remote_version = 0;
 static unsigned char local_version = 1;
 

-ssize_t force_write(int fd, void *buffer, size_t length)
+static ssize_t force_write(int fd, void *buffer, size_t length)

 {
        ssize_t ret = 0;
        while (ret < length) {
 {
        ssize_t ret = 0;
        while (ret < length) {

diff --git a/tools/mailinfo.c b/tools/mailinfo.c
index 5a857f711a0de4e9d098d3c1a7ca23ead0030384..fb2ea2b70bf56c59da34bd90158b929b8ee56caa 100644 (file)
--- a/tools/mailinfo.c
+++ b/tools/mailinfo.c
@@ -152,13 +152,13 @@ static void cleanup_space(char *buf)
 
 static void handle_rest(void)
 {
 
 static void handle_rest(void)
 {

+       FILE *out = cmitmsg;

        char *sub = cleanup_subject(subject);
        cleanup_space(name);
        cleanup_space(date);
        cleanup_space(email);
        cleanup_space(sub);
        printf("Author: %s\nEmail: %s\nSubject: %s\nDate: %s\n\n", name, email, sub, date);
        char *sub = cleanup_subject(subject);
        cleanup_space(name);
        cleanup_space(date);
        cleanup_space(email);
        cleanup_space(sub);
        printf("Author: %s\nEmail: %s\nSubject: %s\nDate: %s\n\n", name, email, sub, date);

-       FILE *out = cmitmsg;

 
        do {
                if (!memcmp("diff -", line, 6) ||
 
        do {
                if (!memcmp("diff -", line, 6) ||