Some more sparse warning fixes

Proper function declarations and NULL pointer usage.

diff --git a/diff-tree.c b/diff-tree.c
index 0b629d20b36f283b70751963bb4fcf5571f28641..0fd28f12883e7e99d73d3b35f536e8168a366c06 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -262,7 +262,7 @@ static void call_diff_setup(void)
        diff_setup(reverse_diff);
 }
 
        diff_setup(reverse_diff);
 }
 

-static int call_diff_flush()
+static int call_diff_flush(void)

 {
        if (detect_rename)
                diffcore_rename(detect_rename, diff_score_opt);
 {
        if (detect_rename)
                diffcore_rename(detect_rename, diff_score_opt);

diff --git a/diff.c b/diff.c
index 4757547ea00f57a6523f0300be24b1c8bcde316e..4b2d1054bae0a6f4b87f6da4a862216d241ff42c 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -165,7 +165,7 @@ struct diff_filespec *alloc_filespec(const char *path)
        spec->should_free = spec->should_munmap = 0;
        spec->xfrm_flags = 0;
        spec->size = 0;
        spec->should_free = spec->should_munmap = 0;
        spec->xfrm_flags = 0;
        spec->size = 0;

-       spec->data = 0;
+       spec->data = NULL;

        spec->mode = 0;
        memset(spec->sha1, 0, 20);
        return spec;
        spec->mode = 0;
        memset(spec->sha1, 0, 20);
        return spec;


@@ -296,7 +296,7 @@ void diff_free_filespec_data(struct diff_filespec *s)
        else if (s->should_munmap)
                munmap(s->data, s->size);
        s->should_free = s->should_munmap = 0;
        else if (s->should_munmap)
                munmap(s->data, s->size);
        s->should_free = s->should_munmap = 0;

-       s->data = 0;
+       s->data = NULL;

 }
 
 static void prep_temp_blob(struct diff_tempfile *temp,
 }
 
 static void prep_temp_blob(struct diff_tempfile *temp,


@@ -444,7 +444,7 @@ static void run_external_diff(const char *name,
                                        *arg++ = other;
                                        *arg++ = xfrm_msg;
                                }
                                        *arg++ = other;
                                        *arg++ = xfrm_msg;
                                }

-                               *arg = 0;
+                               *arg = NULL;

                                execvp(pgm, (char *const*) exec_arg);
                        }
                        else
                                execvp(pgm, (char *const*) exec_arg);
                        }
                        else


@@ -501,7 +501,7 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
        struct diff_filepair *dp = xmalloc(sizeof(*dp));
        dp->one = one;
        dp->two = two;
        struct diff_filepair *dp = xmalloc(sizeof(*dp));
        dp->one = one;
        dp->two = two;

-       dp->xfrm_msg = 0;
+       dp->xfrm_msg = NULL;

        dp->orig_order = queue->nr;
        dp->xfrm_work = 0;
        diff_q(queue, dp);
        dp->orig_order = queue->nr;
        dp->xfrm_work = 0;
        diff_q(queue, dp);