Move local variables to narrower scopes

These weren't used outside and can be safely moved

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

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index df18f4070f3877ed907476f2179590001ec972b7..a7883690d74cb1bcef7b20f27ebbea6f6c5dcc53 100644 (file)
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -256,8 +256,7 @@ static void shortlog(const char *name, unsigned char *sha1,
 
 int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
        int limit = 20, i = 0, pos = 0;
 
 int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
        int limit = 20, i = 0, pos = 0;

-       char line[1024];
-       char *p = line, *sep = "";
+       char *sep = "";

        unsigned char head_sha1[20];
        const char *current_branch;
 
        unsigned char head_sha1[20];
        const char *current_branch;
 


@@ -271,9 +270,8 @@ int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {
        /* get a line */
        while (pos < in->len) {
                int len;
        /* get a line */
        while (pos < in->len) {
                int len;

-               char *newline;
+               char *newline, *p = in->buf + pos;

 
 

-               p = in->buf + pos;

                newline = strchr(p, '\n');
                len = newline ? newline - p : strlen(p);
                pos += len + !!newline;
                newline = strchr(p, '\n');
                len = newline ? newline - p : strlen(p);
                pos += len + !!newline;

diff --git a/combine-diff.c b/combine-diff.c
index bccc018ab2666e769e7865d3cad1d61f04443700..b3b86aebcb81972ca50a031f4e15bb7a905101e0 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -526,7 +526,6 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
                return; /* result deleted */
 
        while (1) {
                return; /* result deleted */
 
        while (1) {

-               struct sline *sl = &sline[lno];

                unsigned long hunk_end;
                unsigned long rlines;
                const char *hunk_comment = NULL;
                unsigned long hunk_end;
                unsigned long rlines;
                const char *hunk_comment = NULL;


@@ -592,7 +591,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent,
                        struct lline *ll;
                        int j;
                        unsigned long p_mask;
                        struct lline *ll;
                        int j;
                        unsigned long p_mask;

-                       sl = &sline[lno++];
+                       struct sline *sl = &sline[lno++];

                        ll = (sl->flag & no_pre_delete) ? NULL : sl->lost_head;
                        while (ll) {
                                fputs(c_old, stdout);
                        ll = (sl->flag & no_pre_delete) ? NULL : sl->lost_head;
                        while (ll) {
                                fputs(c_old, stdout);

diff --git a/log-tree.c b/log-tree.c
index 84a74e544b7bcc20c887f321e389ecf3cfb560d6..63cff74350521cf4cc86cdc253cd95a036fa1c75 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -79,18 +79,18 @@ void show_decorations(struct rev_info *opt, struct commit *commit)
  */
 static int detect_any_signoff(char *letter, int size)
 {
  */
 static int detect_any_signoff(char *letter, int size)
 {

-       char ch, *cp;
+       char *cp;

        int seen_colon = 0;
        int seen_at = 0;
        int seen_name = 0;
        int seen_head = 0;
 
        cp = letter + size;
        int seen_colon = 0;
        int seen_at = 0;
        int seen_name = 0;
        int seen_head = 0;
 
        cp = letter + size;

-       while (letter <= --cp && (ch = *cp) == '\n')
+       while (letter <= --cp && *cp == '\n')

                continue;
 
        while (letter <= cp) {
                continue;
 
        while (letter <= cp) {

-               ch = *cp--;
+               char ch = *cp--;

                if (ch == '\n')
                        break;
 
                if (ch == '\n')
                        break;
 

diff --git a/upload-pack.c b/upload-pack.c
index e15ebdc287e9ed7b91677a2bb8cb13dfc1abe639..a49d87244706a4faacaadf7916ec86f2e2c0f04e 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -397,12 +397,11 @@ static int get_common_commits(void)
        static char line[1000];
        unsigned char sha1[20];
        char hex[41], last_hex[41];
        static char line[1000];
        unsigned char sha1[20];
        char hex[41], last_hex[41];

-       int len;

 
        save_commit_buffer = 0;
 
        for(;;) {
 
        save_commit_buffer = 0;
 
        for(;;) {

-               len = packet_read_line(0, line, sizeof(line));
+               int len = packet_read_line(0, line, sizeof(line));

                reset_timeout();
 
                if (!len) {
                reset_timeout();
 
                if (!len) {


@@ -410,7 +409,7 @@ static int get_common_commits(void)
                                packet_write(1, "NAK\n");
                        continue;
                }
                                packet_write(1, "NAK\n");
                        continue;
                }

-               len = strip(line, len);
+               strip(line, len);

                if (!prefixcmp(line, "have ")) {
                        switch (got_sha1(line+5, sha1)) {
                        case -1: /* they have what we do not */
                if (!prefixcmp(line, "have ")) {
                        switch (got_sha1(line+5, sha1)) {
                        case -1: /* they have what we do not */