Remove unused assignments

These variables were always overwritten or the assigned
value was unused:

builtin-diff-tree.c::cmd_diff_tree(): nr_sha1
builtin-for-each-ref.c::opt_parse_sort(): sort_tail
builtin-mailinfo.c::decode_header_bq(): in
builtin-shortlog.c::insert_one_record(): len
connect.c::git_connect(): path
imap-send.c::v_issue_imap_cmd(): n
pretty.c::pp_user_info(): filler
remote::parse_refspec_internal(): llen

Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 8ecefd4f0f99117534deb9ca7d4446ade5c00223..79cedb72c44dca3edf400d86e401a93531b54407 100644 (file)
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -102,7 +102,6 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 
        init_revisions(opt, prefix);
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 
        init_revisions(opt, prefix);
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */

-       nr_sha1 = 0;

        opt->abbrev = 0;
        opt->diff = 1;
        argc = setup_revisions(argc, argv, opt, NULL);
        opt->abbrev = 0;
        opt->diff = 1;
        argc = setup_revisions(argc, argv, opt, NULL);

diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index e46b7adc9719e147536398e8e365d6d3e65a4ba7..5cbb4b081d63b52393a5f85716ba6961a18fa59e 100644 (file)
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -943,7 +943,6 @@ static int opt_parse_sort(const struct option *opt, const char *arg, int unset)
                return -1;
 
        *sort_tail = s = xcalloc(1, sizeof(*s));
                return -1;
 
        *sort_tail = s = xcalloc(1, sizeof(*s));

-       sort_tail = &s->next;

 
        if (*arg == '-') {
                s->reverse = 1;
 
        if (*arg == '-') {
                s->reverse = 1;

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 2789ccdf7dd43a1170a1ca28a3e4d4802422e719..1eeeb4de6d0d54e3fd753b7f057351094e10a24e 100644 (file)
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -537,7 +537,6 @@ static int decode_header_bq(struct strbuf *it)
                                 */
                                strbuf_add(&outbuf, in, ep - in);
                        }
                                 */
                                strbuf_add(&outbuf, in, ep - in);
                        }

-                       in = ep;

                }
                /* E.g.
                 * ep : "=?iso-2022-jp?B?GyR...?= foo"
                }
                /* E.g.
                 * ep : "=?iso-2022-jp?B?GyR...?= foo"

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index badd9120388569c79b137f679505b495cc1dbbe9..b28091b4455db15e80841f2779ce0686d4f18826 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -101,7 +101,6 @@ static void insert_one_record(struct shortlog *log,
        }
        while (*oneline && isspace(*oneline) && *oneline != '\n')
                oneline++;
        }
        while (*oneline && isspace(*oneline) && *oneline != '\n')
                oneline++;

-       len = eol - oneline;

        format_subject(&subject, oneline, " ");
        buffer = strbuf_detach(&subject, NULL);
 
        format_subject(&subject, oneline, " ");
        buffer = strbuf_detach(&subject, NULL);
 

diff --git a/connect.c b/connect.c
index 0a35cc1b25c22256845acffb35828cfa44316892..7636bf976e78a6622281501af2dcc0135781f60a 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -504,7 +504,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
                                  const char *prog, int flags)
 {
        char *url = xstrdup(url_orig);
                                  const char *prog, int flags)
 {
        char *url = xstrdup(url_orig);

-       char *host, *path = url;
+       char *host, *path;

        char *end;
        int c;
        struct child_process *conn;
        char *end;
        int c;
        struct child_process *conn;

diff --git a/imap-send.c b/imap-send.c
index cb518eb613fdce7482a243ad9075df64ab1a4321..8154cb2116da9257ecf286c46f77fc1ed2a62afc 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -579,7 +579,7 @@ static struct imap_cmd *v_issue_imap_cmd(struct imap_store *ctx,
                        n = socket_write(&imap->buf.sock, cmd->cb.data, cmd->cb.dlen);
                        free(cmd->cb.data);
                        if (n != cmd->cb.dlen ||
                        n = socket_write(&imap->buf.sock, cmd->cb.data, cmd->cb.dlen);
                        free(cmd->cb.data);
                        if (n != cmd->cb.dlen ||

-                           (n = socket_write(&imap->buf.sock, "\r\n", 2)) != 2) {
+                           socket_write(&imap->buf.sock, "\r\n", 2) != 2) {

                                free(cmd->cmd);
                                free(cmd);
                                return NULL;
                                free(cmd->cmd);
                                free(cmd);
                                return NULL;

diff --git a/pretty.c b/pretty.c
index c0184080998734450b250aa7dc72c427e1ecac8a..efa70245f19ef3493cd701ea20505203a466d65e 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -135,7 +135,6 @@ void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
        int namelen;
        unsigned long time;
        int tz;
        int namelen;
        unsigned long time;
        int tz;

-       const char *filler = "    ";

 
        if (fmt == CMIT_FMT_ONELINE)
                return;
 
        if (fmt == CMIT_FMT_ONELINE)
                return;


@@ -154,7 +153,6 @@ void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
                while (line < name_tail && isspace(name_tail[-1]))
                        name_tail--;
                display_name_length = name_tail - line;
                while (line < name_tail && isspace(name_tail[-1]))
                        name_tail--;
                display_name_length = name_tail - line;

-               filler = "";

                strbuf_addstr(sb, "From: ");
                add_rfc2047(sb, line, display_name_length, encoding);
                strbuf_add(sb, name_tail, namelen - display_name_length);
                strbuf_addstr(sb, "From: ");
                add_rfc2047(sb, line, display_name_length, encoding);
                strbuf_add(sb, name_tail, namelen - display_name_length);


@@ -162,7 +160,7 @@ void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
        } else {
                strbuf_addf(sb, "%s: %.*s%.*s\n", what,
                              (fmt == CMIT_FMT_FULLER) ? 4 : 0,
        } else {
                strbuf_addf(sb, "%s: %.*s%.*s\n", what,
                              (fmt == CMIT_FMT_FULLER) ? 4 : 0,

-                             filler, namelen, line);
+                             "    ", namelen, line);

        }
        switch (fmt) {
        case CMIT_FMT_MEDIUM:
        }
        switch (fmt) {
        case CMIT_FMT_MEDIUM:

diff --git a/remote.c b/remote.c
index d7079c6dd871dc1b482d347d013438fe30cc0908..7efaa023b985745b5555e35f8d3a8169870571bd 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -495,7 +495,7 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
                int is_glob;
                const char *lhs, *rhs;
 
                int is_glob;
                const char *lhs, *rhs;
 

-               llen = is_glob = 0;
+               is_glob = 0;

 
                lhs = refspec[i];
                if (*lhs == '+') {
 
                lhs = refspec[i];
                if (*lhs == '+') {