summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2011-03-22 13:50:08 +0100
committerJunio C Hamano <gitster@pobox.com>2011-03-22 11:43:27 -0700
commitc0aa335c95974caebcc972cd63a11e6ff73b1612 (patch)
tree95b46205d5a696acda8b2e4624bb65635964fd8e
parentc2e86addb86689306b992065328ec52aa2479658 (diff)
downloadgit-c0aa335c95974caebcc972cd63a11e6ff73b1612.tar.gz
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>
-rw-r--r--builtin/fsck.c3
-rw-r--r--builtin/remote-ext.c4
-rw-r--r--diff.c3
-rw-r--r--reachable.c5
-rw-r--r--test-subprocess.c3
-rw-r--r--transport-helper.c3
-rw-r--r--tree-diff.c3
7 files changed, 5 insertions, 19 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 795aba087f..5ae0366bc8 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -140,11 +140,10 @@ static int traverse_reachable(void)
int result = 0;
while (pending.nr) {
struct object_array_entry *entry;
- struct object *obj, *parent;
+ struct object *obj;
entry = pending.objects + --pending.nr;
obj = entry->item;
- parent = (struct object *) entry->name;
result |= traverse_one_object(obj);
}
return !!result;
diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index 155e609d68..692c834d9d 100644
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -30,16 +30,12 @@ static char *strip_escapes(const char *str, const char *service,
size_t rpos = 0;
int escape = 0;
char special = 0;
- size_t pslen = 0;
- size_t pSlen = 0;
size_t psoff = 0;
struct strbuf ret = STRBUF_INIT;
/* Calculate prefix length for \s and lengths for \s and \S */
if (!strncmp(service, "git-", 4))
psoff = 4;
- pSlen = strlen(service);
- pslen = pSlen - psoff;
/* Pass the service to command. */
setenv("GIT_EXT_SERVICE", service, 1);
diff --git a/diff.c b/diff.c
index 9b3eb9938f..9fa841010c 100644
--- a/diff.c
+++ b/diff.c
@@ -1242,7 +1242,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
uintmax_t max_change = 0, max_len = 0;
int total_files = data->nr;
int width, name_width;
- const char *reset, *set, *add_c, *del_c;
+ const char *reset, *add_c, *del_c;
const char *line_prefix = "";
struct strbuf *msg = NULL;
@@ -1269,7 +1269,6 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
/* Find the longest filename and max number of changes */
reset = diff_get_color_opt(options, DIFF_RESET);
- set = diff_get_color_opt(options, DIFF_PLAIN);
add_c = diff_get_color_opt(options, DIFF_FILE_NEW);
del_c = diff_get_color_opt(options, DIFF_FILE_OLD);
diff --git a/reachable.c b/reachable.c
index a03fabf060..3fc6b1d320 100644
--- a/reachable.c
+++ b/reachable.c
@@ -70,16 +70,11 @@ static void process_tree(struct tree *tree,
static void process_tag(struct tag *tag, struct object_array *p, const char *name)
{
struct object *obj = &tag->object;
- struct name_path me;
if (obj->flags & SEEN)
return;
obj->flags |= SEEN;
- me.up = NULL;
- me.elem = "tag:/";
- me.elem_len = 5;
-
if (parse_tag(tag) < 0)
die("bad tag object %s", sha1_to_hex(obj->sha1));
if (tag->tagged)
diff --git a/test-subprocess.c b/test-subprocess.c
index 667d3e5079..8926bc52a9 100644
--- a/test-subprocess.c
+++ b/test-subprocess.c
@@ -3,11 +3,10 @@
int main(int argc, char **argv)
{
- const char *prefix;
struct child_process cp;
int nogit = 0;
- prefix = setup_git_directory_gently(&nogit);
+ setup_git_directory_gently(&nogit);
if (nogit)
die("No git repo found");
if (!strcmp(argv[1], "--setup-work-tree")) {
diff --git a/transport-helper.c b/transport-helper.c
index 5846b55875..660147f9e9 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -561,10 +561,9 @@ static int push_refs_with_push(struct transport *transport,
int mirror = flags & TRANSPORT_PUSH_MIRROR;
struct helper_data *data = transport->data;
struct strbuf buf = STRBUF_INIT;
- struct child_process *helper;
struct ref *ref;
- helper = get_helper(transport);
+ get_helper(transport);
if (!data->push)
return 1;
diff --git a/tree-diff.c b/tree-diff.c
index 3954281f50..76f83fcc27 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -17,7 +17,6 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2,
const unsigned char *sha1, *sha2;
int cmp, pathlen1, pathlen2;
int old_baselen = base->len;
- int retval = 0;
sha1 = tree_entry_extract(t1, &path1, &mode1);
sha2 = tree_entry_extract(t2, &path2, &mode2);
@@ -53,7 +52,7 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2,
sha1, sha2, base->buf, 0, 0);
}
strbuf_addch(base, '/');
- retval = diff_tree_sha1(sha1, sha2, base->buf, opt);
+ diff_tree_sha1(sha1, sha2, base->buf, opt);
} else {
opt->change(opt, mode1, mode2, sha1, sha2, base->buf, 0, 0);
}