Remove unused variables
Noticed by gcc 4.6.0. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Mar 22, 2011 at 13:50 UTC
c0aa335c95974caebcc972cd63a11e6ff73b1612
7 files changed
+5
-19
builtin/fsck.c
+1
-2
@@ -140,11 +140,10 @@ static int traverse_reachable(void)
140
int result = 0;
141
while (pending.nr) {
142
struct object_array_entry *entry;
143
- struct object *obj, *parent;
143
+ struct object *obj;
144
145
entry = pending.objects + --pending.nr;
146
obj = entry->item;
147
- parent = (struct object *) entry->name;
147
result |= traverse_one_object(obj);
148
}
149
return !!result;
builtin/remote-ext.c
-4
@@ -30,16 +30,12 @@ static char *strip_escapes(const char *str, const char *service,
30
size_t rpos = 0;
31
int escape = 0;
32
char special = 0;
33
- size_t pslen = 0;
34
- size_t pSlen = 0;
33
size_t psoff = 0;
34
struct strbuf ret = STRBUF_INIT;
35
36
/* Calculate prefix length for \s and lengths for \s and \S */
37
if (!strncmp(service, "git-", 4))
38
psoff = 4;
41
- pSlen = strlen(service);
42
- pslen = pSlen - psoff;
39
40
/* Pass the service to command. */
41
setenv("GIT_EXT_SERVICE", service, 1);
diff.c
+1
-2
@@ -1242,7 +1242,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
1242
uintmax_t max_change = 0, max_len = 0;
1243
int total_files = data->nr;
1244
int width, name_width;
1245
- const char *reset, *set, *add_c, *del_c;
1245
+ const char *reset, *add_c, *del_c;
1246
const char *line_prefix = "";
1247
struct strbuf *msg = NULL;
1248
@@ -1269,7 +1269,6 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
1269
1270
/* Find the longest filename and max number of changes */
1271
reset = diff_get_color_opt(options, DIFF_RESET);
1272
- set = diff_get_color_opt(options, DIFF_PLAIN);
1272
add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
1273
del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
1274
reachable.c
-5
@@ -70,16 +70,11 @@ static void process_tree(struct tree *tree,
70
static void process_tag(struct tag *tag, struct object_array *p, const char *name)
71
{
72
struct object *obj = &tag->object;
73
- struct name_path me;
73
74
if (obj->flags & SEEN)
75
return;
76
obj->flags |= SEEN;
77
79
- me.up = NULL;
80
- me.elem = "tag:/";
81
- me.elem_len = 5;
82
-
78
if (parse_tag(tag) < 0)
79
die("bad tag object %s", sha1_to_hex(obj->sha1));
80
if (tag->tagged)
test-subprocess.c
+1
-2
@@ -3,11 +3,10 @@
3
4
int main(int argc, char **argv)
5
{
6
- const char *prefix;
6
struct child_process cp;
7
int nogit = 0;
8
10
- prefix = setup_git_directory_gently(&nogit);
9
+ setup_git_directory_gently(&nogit);
10
if (nogit)
11
die("No git repo found");
12
if (!strcmp(argv[1], "--setup-work-tree")) {
transport-helper.c
+1
-2
@@ -561,10 +561,9 @@ static int push_refs_with_push(struct transport *transport,
561
int mirror = flags & TRANSPORT_PUSH_MIRROR;
562
struct helper_data *data = transport->data;
563
struct strbuf buf = STRBUF_INIT;
564
- struct child_process *helper;
564
struct ref *ref;
565
567
- helper = get_helper(transport);
566
+ get_helper(transport);
567
if (!data->push)
568
return 1;
569
tree-diff.c
+1
-2
@@ -17,7 +17,6 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2,
17
const unsigned char *sha1, *sha2;
18
int cmp, pathlen1, pathlen2;
19
int old_baselen = base->len;
20
- int retval = 0;
20
21
sha1 = tree_entry_extract(t1, &path1, &mode1);
22
sha2 = tree_entry_extract(t2, &path2, &mode2);
@@ -53,7 +52,7 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2,
52
sha1, sha2, base->buf, 0, 0);
53
}
54
strbuf_addch(base, '/');
56
- retval = diff_tree_sha1(sha1, sha2, base->buf, opt);
55
+ diff_tree_sha1(sha1, sha2, base->buf, opt);
56
} else {
57
opt->change(opt, mode1, mode2, sha1, sha2, base->buf, 0, 0);
58
}