{"thread":{"id":"18202","subject":"[PATCH 1/2] removed some unused variables","startedAt":"2009-03-07T20:02:10Z","lastAt":"2009-03-07T23:52:46Z","messageCount":2,"participants":["Benjamin Kramer","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"107333","messageId":"7f978c810903071202w59a5ca37id6d1fee405c24e9c@mail.gmail.com","threadId":"18202","inReplyTo":null,"subject":"[PATCH 1/2] removed some unused variables","fromName":"Benjamin Kramer","fromEmail":"benny.kra@googlemail.com","sentAt":"2009-03-07T20:02:10Z","receivedAt":"2009-03-07T20:02:10Z","isPatch":true,"sender":{"key":"benny.kra@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/16542?v=4"},"body":"these variables were unused and can be removed safely\n\nbuiltin-clone: removed unused variable 'option_no_hardlinks'\nbuiltin-clone: removed unused variable 'use_separate_remote'\nbuiltin-fetch-pack: removed unused variable 'len'\nbuiltin-remote: removed unused variable 'symref'\ndiff: removed unused variable 'total'\ndiffcore-break: removed unused variable 'base_size'\nfast-import: removed unused variable 'date'\nfast-import: removed unused variable 'sign'\nfsck: removed unused variable 'o_sha1'\nfsck: removed unused variable 'sha1'\nxdiff-interface: removed unused variable 'read_some'\n\nSigned-off-by: Benjamin Kramer <benny.kra@googlemail.com>\n---\n builtin-clone.c      |    6 ------\n builtin-fetch-pack.c |    3 +--\n builtin-remote.c     |    3 +--\n diff.c               |    4 +---\n diffcore-break.c     |    3 +--\n fast-import.c        |    8 +++-----\n fsck.c               |    6 +-----\n xdiff-interface.c    |    3 +--\n 8 files changed, 9 insertions(+), 27 deletions(-)\n\ndiff --git a/builtin-clone.c b/builtin-clone.c\nindex c338910..92826cd 100644\n--- a/builtin-clone.c\n+++ b/builtin-clone.c\n@@ -365,8 +365,6 @@ static void install_branch_config(const char *local,\n\n int cmd_clone(int argc, const char **argv, const char *prefix)\n {\n-\tint use_local_hardlinks = 1;\n-\tint use_separate_remote = 1;\n \tint is_bundle = 0;\n \tstruct stat buf;\n \tconst char *repo_name, *repo, *work_tree, *git_dir;\n@@ -388,9 +386,6 @@ int cmd_clone(int argc, const char **argv, const\nchar *prefix)\n \tif (argc == 0)\n \t\tdie(\"You must specify a repository to clone.\");\n\n-\tif (option_no_hardlinks)\n-\t\tuse_local_hardlinks = 0;\n-\n \tif (option_mirror)\n \t\toption_bare = 1;\n\n@@ -399,7 +394,6 @@ int cmd_clone(int argc, const char **argv, const\nchar *prefix)\n \t\t\tdie(\"--bare and --origin %s options are incompatible.\",\n \t\t\t    option_origin);\n \t\toption_no_checkout = 1;\n-\t\tuse_separate_remote = 0;\n \t}\n\n \tif (!option_origin)\ndiff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c\nindex 67fb80e..c2e5adc 100644\n--- a/builtin-fetch-pack.c\n+++ b/builtin-fetch-pack.c\n@@ -216,9 +216,8 @@ static int find_common(int fd[2], unsigned char\n*result_sha1,\n \tif (args.depth > 0) {\n \t\tchar line[1024];\n \t\tunsigned char sha1[20];\n-\t\tint len;\n\n-\t\twhile ((len = packet_read_line(fd[0], line, sizeof(line)))) {\n+\t\twhile (packet_read_line(fd[0], line, sizeof(line))) {\n \t\t\tif (!prefixcmp(line, \"shallow \")) {\n \t\t\t\tif (get_sha1_hex(line + 8, sha1))\n \t\t\t\t\tdie(\"invalid shallow line: %s\", line);\ndiff --git a/builtin-remote.c b/builtin-remote.c\nindex ac69d37..e171096 100644\n--- a/builtin-remote.c\n+++ b/builtin-remote.c\n@@ -484,9 +484,8 @@ static int mv(int argc, const char **argv)\n \t\tstruct string_list_item *item = remote_branches.items + i;\n \t\tint flag = 0;\n \t\tunsigned char sha1[20];\n-\t\tconst char *symref;\n\n-\t\tsymref = resolve_ref(item->string, sha1, 1, &flag);\n+\t\tresolve_ref(item->string, sha1, 1, &flag);\n \t\tif (!(flag & REF_ISSYMREF))\n \t\t\tcontinue;\n \t\tif (delete_ref(item->string, NULL, REF_NODEREF))\ndiff --git a/diff.c b/diff.c\nindex 3feca1b..e06c937 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -875,7 +875,7 @@ static void fill_print_name(struct diffstat_file *file)\n\n static void show_stats(struct diffstat_t* data, struct diff_options *options)\n {\n-\tint i, len, add, del, total, adds = 0, dels = 0;\n+\tint i, len, add, del, adds = 0, dels = 0;\n \tint max_change = 0, max_len = 0;\n \tint total_files = data->nr;\n \tint width, name_width;\n@@ -978,14 +978,12 @@ static void show_stats(struct diffstat_t* data,\nstruct diff_options *options)\n \t\t */\n \t\tadd = added;\n \t\tdel = deleted;\n-\t\ttotal = add + del;\n \t\tadds += add;\n \t\tdels += del;\n\n \t\tif (width <= max_change) {\n \t\t\tadd = scale_linear(add, width, max_change);\n \t\t\tdel = scale_linear(del, width, max_change);\n-\t\t\ttotal = add + del;\n \t\t}\n \t\tshow_name(options->file, prefix, name, len, reset, set);\n \t\tfprintf(options->file, \"%5d%s\", added + deleted,\ndiff --git a/diffcore-break.c b/diffcore-break.c\nindex 31cdcfe..d7097bb 100644\n--- a/diffcore-break.c\n+++ b/diffcore-break.c\n@@ -45,7 +45,7 @@ static int should_break(struct diff_filespec *src,\n \t * The value we return is 1 if we want the pair to be broken,\n \t * or 0 if we do not.\n \t */\n-\tunsigned long delta_size, base_size, max_size;\n+\tunsigned long delta_size, max_size;\n \tunsigned long src_copied, literal_added, src_removed;\n\n \t*merge_score_p = 0; /* assume no deletion --- \"do not break\"\n@@ -64,7 +64,6 @@ static int should_break(struct diff_filespec *src,\n \tif (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))\n \t\treturn 0; /* error but caught downstream */\n\n-\tbase_size = ((src->size < dst->size) ? src->size : dst->size);\n \tmax_size = ((src->size > dst->size) ? src->size : dst->size);\n \tif (max_size < MINIMUM_BREAK_SIZE)\n \t\treturn 0; /* we do not break too small filepair */\ndiff --git a/fast-import.c b/fast-import.c\nindex 3748ddf..beeac0d 100644\n--- a/fast-import.c\n+++ b/fast-import.c\n@@ -1745,21 +1745,19 @@ static void parse_data(struct strbuf *sb)\n static int validate_raw_date(const char *src, char *result, int maxlen)\n {\n \tconst char *orig_src = src;\n-\tchar *endp, sign;\n-\tunsigned long date;\n+\tchar *endp;\n\n \terrno = 0;\n\n-\tdate = strtoul(src, &endp, 10);\n+\tstrtoul(src, &endp, 10);\n \tif (errno || endp == src || *endp != ' ')\n \t\treturn -1;\n\n \tsrc = endp + 1;\n \tif (*src != '-' && *src != '+')\n \t\treturn -1;\n-\tsign = *src;\n\n-\tdate = strtoul(src + 1, &endp, 10);\n+\tstrtoul(src + 1, &endp, 10);\n \tif (errno || endp == src || *endp || (endp - orig_src) >= maxlen)\n \t\treturn -1;\n\ndiff --git a/fsck.c b/fsck.c\nindex 97f76c5..511b82c 100644\n--- a/fsck.c\n+++ b/fsck.c\n@@ -148,20 +148,17 @@ static int fsck_tree(struct tree *item, int\nstrict, fsck_error error_func)\n \tstruct tree_desc desc;\n \tunsigned o_mode;\n \tconst char *o_name;\n-\tconst unsigned char *o_sha1;\n\n \tinit_tree_desc(&desc, item->buffer, item->size);\n\n \to_mode = 0;\n \to_name = NULL;\n-\to_sha1 = NULL;\n\n \twhile (desc.size) {\n \t\tunsigned mode;\n \t\tconst char *name;\n-\t\tconst unsigned char *sha1;\n\n-\t\tsha1 = tree_entry_extract(&desc, &name, &mode);\n+\t\ttree_entry_extract(&desc, &name, &mode);\n\n \t\tif (strchr(name, '/'))\n \t\t\thas_full_path = 1;\n@@ -207,7 +204,6 @@ static int fsck_tree(struct tree *item, int\nstrict, fsck_error error_func)\n\n \t\to_mode = mode;\n \t\to_name = name;\n-\t\to_sha1 = sha1;\n \t}\n\n \tretval = 0;\ndiff --git a/xdiff-interface.c b/xdiff-interface.c\nindex d782f06..b9b0db8 100644\n--- a/xdiff-interface.c\n+++ b/xdiff-interface.c\n@@ -15,11 +15,10 @@ static int parse_num(char **cp_p, int *num_p)\n {\n \tchar *cp = *cp_p;\n \tint num = 0;\n-\tint read_some;\n\n \twhile ('0' <= *cp && *cp <= '9')\n \t\tnum = num * 10 + *cp++ - '0';\n-\tif (!(read_some = cp - *cp_p))\n+\tif (!(cp - *cp_p))\n \t\treturn -1;\n \t*cp_p = cp;\n \t*num_p = num;\n-- \n1.6.2.81.ge603.dirty\n"},{"id":"107357","messageId":"20090307235245.GA19926@coredump.intra.peff.net","threadId":"18202","inReplyTo":"7f978c810903071202w59a5ca37id6d1fee405c24e9c@mail.gmail.com","subject":"Re: [PATCH 1/2] removed some unused variables","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-07T23:52:46Z","receivedAt":"2009-03-07T23:52:46Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Mar 07, 2009 at 09:02:10PM +0100, Benjamin Kramer wrote:\n\n> these variables were unused and can be removed safely\n> \n> builtin-clone: removed unused variable 'option_no_hardlinks'\n\nI did a double-take here, as I was just looking at option_no_hardlinks\ncode the other day. But looking at your patch, I think you meant\n\"use_local_hardlinks\".\n\n> @@ -388,9 +386,6 @@ int cmd_clone(int argc, const char **argv, const\n> char *prefix)\n\nYour patch is damaged due to wrapping here (and several other places).\nPlease check your mailer settings.\n\nOther than that, I think it is a fine cleanup.\n\n-Peff\n"}]}