{"thread":{"id":"18203","subject":"[PATCH 2/2] moved some variables into narrower scopes","startedAt":"2009-03-07T20:02:26Z","lastAt":"2009-03-07T20:02:26Z","messageCount":1,"participants":["Benjamin Kramer"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"107334","messageId":"7f978c810903071202p18c4f8fjbddc0176b80c76b2@mail.gmail.com","threadId":"18203","inReplyTo":null,"subject":"[PATCH 2/2] moved some variables into narrower scopes","fromName":"Benjamin Kramer","fromEmail":"benny.kra@googlemail.com","sentAt":"2009-03-07T20:02:26Z","receivedAt":"2009-03-07T20:02:26Z","isPatch":true,"sender":{"key":"benny.kra@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/16542?v=4"},"body":"they weren't used outside and can be safely moved\n\nbuiltin-fmt-merge-msg: moved variable to narrower scope\ncombine-diff: moved variable to narrower scope\nlog-tree: moved variable to narrower scope\nupload-pack: moved variable to narrower scope\nupload-pack: removed unused assignment\n\nSigned-off-by: Benjamin Kramer <benny.kra@googlemail.com>\n---\n builtin-fmt-merge-msg.c |    5 ++---\n combine-diff.c          |    3 +--\n log-tree.c              |    6 +++---\n upload-pack.c           |    5 ++---\n 4 files changed, 8 insertions(+), 11 deletions(-)\n\ndiff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\nindex df18f40..5c5b310 100644\n--- a/builtin-fmt-merge-msg.c\n+++ b/builtin-fmt-merge-msg.c\n@@ -257,7 +257,7 @@ static void shortlog(const char *name, unsigned char *sha1,\n int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {\n \tint limit = 20, i = 0, pos = 0;\n \tchar line[1024];\n-\tchar *p = line, *sep = \"\";\n+\tchar *sep = \"\";\n \tunsigned char head_sha1[20];\n \tconst char *current_branch;\n\n@@ -271,9 +271,8 @@ int fmt_merge_msg(int merge_summary, struct strbuf\n*in, struct strbuf *out) {\n \t/* get a line */\n \twhile (pos < in->len) {\n \t\tint len;\n-\t\tchar *newline;\n+\t\tchar *newline, *p = in->buf + pos;\n\n-\t\tp = in->buf + pos;\n \t\tnewline = strchr(p, '\\n');\n \t\tlen = newline ? newline - p : strlen(p);\n \t\tpos += len + !!newline;\ndiff --git a/combine-diff.c b/combine-diff.c\nindex bccc018..b3b86ae 100644\n--- a/combine-diff.c\n+++ b/combine-diff.c\n@@ -526,7 +526,6 @@ static void dump_sline(struct sline *sline,\nunsigned long cnt, int num_parent,\n \t\treturn; /* result deleted */\n\n \twhile (1) {\n-\t\tstruct sline *sl = &sline[lno];\n \t\tunsigned long hunk_end;\n \t\tunsigned long rlines;\n \t\tconst char *hunk_comment = NULL;\n@@ -592,7 +591,7 @@ static void dump_sline(struct sline *sline,\nunsigned long cnt, int num_parent,\n \t\t\tstruct lline *ll;\n \t\t\tint j;\n \t\t\tunsigned long p_mask;\n-\t\t\tsl = &sline[lno++];\n+\t\t\tstruct sline *sl = &sline[lno++];\n \t\t\tll = (sl->flag & no_pre_delete) ? NULL : sl->lost_head;\n \t\t\twhile (ll) {\n \t\t\t\tfputs(c_old, stdout);\ndiff --git a/log-tree.c b/log-tree.c\nindex 84a74e5..63cff74 100644\n--- a/log-tree.c\n+++ b/log-tree.c\n@@ -79,18 +79,18 @@ void show_decorations(struct rev_info *opt, struct\ncommit *commit)\n  */\n static int detect_any_signoff(char *letter, int size)\n {\n-\tchar ch, *cp;\n+\tchar *cp;\n \tint seen_colon = 0;\n \tint seen_at = 0;\n \tint seen_name = 0;\n \tint seen_head = 0;\n\n \tcp = letter + size;\n-\twhile (letter <= --cp && (ch = *cp) == '\\n')\n+\twhile (letter <= --cp && *cp == '\\n')\n \t\tcontinue;\n\n \twhile (letter <= cp) {\n-\t\tch = *cp--;\n+\t\tchar ch = *cp--;\n \t\tif (ch == '\\n')\n \t\t\tbreak;\n\ndiff --git a/upload-pack.c b/upload-pack.c\nindex e15ebdc..a49d872 100644\n--- a/upload-pack.c\n+++ b/upload-pack.c\n@@ -397,12 +397,11 @@ static int get_common_commits(void)\n \tstatic char line[1000];\n \tunsigned char sha1[20];\n \tchar hex[41], last_hex[41];\n-\tint len;\n\n \tsave_commit_buffer = 0;\n\n \tfor(;;) {\n-\t\tlen = packet_read_line(0, line, sizeof(line));\n+\t\tint len = packet_read_line(0, line, sizeof(line));\n \t\treset_timeout();\n\n \t\tif (!len) {\n@@ -410,7 +409,7 @@ static int get_common_commits(void)\n \t\t\t\tpacket_write(1, \"NAK\\n\");\n \t\t\tcontinue;\n \t\t}\n-\t\tlen = strip(line, len);\n+\t\tstrip(line, len);\n \t\tif (!prefixcmp(line, \"have \")) {\n \t\t\tswitch (got_sha1(line+5, sha1)) {\n \t\t\tcase -1: /* they have what we do not */\n-- \n1.6.2.81.ge603.dirty\n"}]}