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>maint
							parent
							
								
									c2e86addb8
								
							
						
					
					
						commit
						c0aa335c95
					
				|  | @ -140,11 +140,10 @@ static int traverse_reachable(void) | ||||||
| 	int result = 0; | 	int result = 0; | ||||||
| 	while (pending.nr) { | 	while (pending.nr) { | ||||||
| 		struct object_array_entry *entry; | 		struct object_array_entry *entry; | ||||||
| 		struct object *obj, *parent; | 		struct object *obj; | ||||||
|  |  | ||||||
| 		entry = pending.objects + --pending.nr; | 		entry = pending.objects + --pending.nr; | ||||||
| 		obj = entry->item; | 		obj = entry->item; | ||||||
| 		parent = (struct object *) entry->name; |  | ||||||
| 		result |= traverse_one_object(obj); | 		result |= traverse_one_object(obj); | ||||||
| 	} | 	} | ||||||
| 	return !!result; | 	return !!result; | ||||||
|  |  | ||||||
|  | @ -30,16 +30,12 @@ static char *strip_escapes(const char *str, const char *service, | ||||||
| 	size_t rpos = 0; | 	size_t rpos = 0; | ||||||
| 	int escape = 0; | 	int escape = 0; | ||||||
| 	char special = 0; | 	char special = 0; | ||||||
| 	size_t pslen = 0; |  | ||||||
| 	size_t pSlen = 0; |  | ||||||
| 	size_t psoff = 0; | 	size_t psoff = 0; | ||||||
| 	struct strbuf ret = STRBUF_INIT; | 	struct strbuf ret = STRBUF_INIT; | ||||||
|  |  | ||||||
| 	/* Calculate prefix length for \s and lengths for \s and \S */ | 	/* Calculate prefix length for \s and lengths for \s and \S */ | ||||||
| 	if (!strncmp(service, "git-", 4)) | 	if (!strncmp(service, "git-", 4)) | ||||||
| 		psoff = 4; | 		psoff = 4; | ||||||
| 	pSlen = strlen(service); |  | ||||||
| 	pslen = pSlen - psoff; |  | ||||||
|  |  | ||||||
| 	/* Pass the service to command. */ | 	/* Pass the service to command. */ | ||||||
| 	setenv("GIT_EXT_SERVICE", service, 1); | 	setenv("GIT_EXT_SERVICE", service, 1); | ||||||
|  |  | ||||||
							
								
								
									
										3
									
								
								diff.c
								
								
								
								
							
							
						
						
									
										3
									
								
								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; | 	uintmax_t max_change = 0, max_len = 0; | ||||||
| 	int total_files = data->nr; | 	int total_files = data->nr; | ||||||
| 	int width, name_width; | 	int width, name_width; | ||||||
| 	const char *reset, *set, *add_c, *del_c; | 	const char *reset, *add_c, *del_c; | ||||||
| 	const char *line_prefix = ""; | 	const char *line_prefix = ""; | ||||||
| 	struct strbuf *msg = NULL; | 	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 */ | 	/* Find the longest filename and max number of changes */ | ||||||
| 	reset = diff_get_color_opt(options, DIFF_RESET); | 	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); | 	add_c = diff_get_color_opt(options, DIFF_FILE_NEW); | ||||||
| 	del_c = diff_get_color_opt(options, DIFF_FILE_OLD); | 	del_c = diff_get_color_opt(options, DIFF_FILE_OLD); | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @ -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) | static void process_tag(struct tag *tag, struct object_array *p, const char *name) | ||||||
| { | { | ||||||
| 	struct object *obj = &tag->object; | 	struct object *obj = &tag->object; | ||||||
| 	struct name_path me; |  | ||||||
|  |  | ||||||
| 	if (obj->flags & SEEN) | 	if (obj->flags & SEEN) | ||||||
| 		return; | 		return; | ||||||
| 	obj->flags |= SEEN; | 	obj->flags |= SEEN; | ||||||
|  |  | ||||||
| 	me.up = NULL; |  | ||||||
| 	me.elem = "tag:/"; |  | ||||||
| 	me.elem_len = 5; |  | ||||||
|  |  | ||||||
| 	if (parse_tag(tag) < 0) | 	if (parse_tag(tag) < 0) | ||||||
| 		die("bad tag object %s", sha1_to_hex(obj->sha1)); | 		die("bad tag object %s", sha1_to_hex(obj->sha1)); | ||||||
| 	if (tag->tagged) | 	if (tag->tagged) | ||||||
|  |  | ||||||
|  | @ -3,11 +3,10 @@ | ||||||
|  |  | ||||||
| int main(int argc, char **argv) | int main(int argc, char **argv) | ||||||
| { | { | ||||||
| 	const char *prefix; |  | ||||||
| 	struct child_process cp; | 	struct child_process cp; | ||||||
| 	int nogit = 0; | 	int nogit = 0; | ||||||
|  |  | ||||||
| 	prefix = setup_git_directory_gently(&nogit); | 	setup_git_directory_gently(&nogit); | ||||||
| 	if (nogit) | 	if (nogit) | ||||||
| 		die("No git repo found"); | 		die("No git repo found"); | ||||||
| 	if (!strcmp(argv[1], "--setup-work-tree")) { | 	if (!strcmp(argv[1], "--setup-work-tree")) { | ||||||
|  |  | ||||||
|  | @ -561,10 +561,9 @@ static int push_refs_with_push(struct transport *transport, | ||||||
| 	int mirror = flags & TRANSPORT_PUSH_MIRROR; | 	int mirror = flags & TRANSPORT_PUSH_MIRROR; | ||||||
| 	struct helper_data *data = transport->data; | 	struct helper_data *data = transport->data; | ||||||
| 	struct strbuf buf = STRBUF_INIT; | 	struct strbuf buf = STRBUF_INIT; | ||||||
| 	struct child_process *helper; |  | ||||||
| 	struct ref *ref; | 	struct ref *ref; | ||||||
|  |  | ||||||
| 	helper = get_helper(transport); | 	get_helper(transport); | ||||||
| 	if (!data->push) | 	if (!data->push) | ||||||
| 		return 1; | 		return 1; | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @ -17,7 +17,6 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, | ||||||
| 	const unsigned char *sha1, *sha2; | 	const unsigned char *sha1, *sha2; | ||||||
| 	int cmp, pathlen1, pathlen2; | 	int cmp, pathlen1, pathlen2; | ||||||
| 	int old_baselen = base->len; | 	int old_baselen = base->len; | ||||||
| 	int retval = 0; |  | ||||||
|  |  | ||||||
| 	sha1 = tree_entry_extract(t1, &path1, &mode1); | 	sha1 = tree_entry_extract(t1, &path1, &mode1); | ||||||
| 	sha2 = tree_entry_extract(t2, &path2, &mode2); | 	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); | 				    sha1, sha2, base->buf, 0, 0); | ||||||
| 		} | 		} | ||||||
| 		strbuf_addch(base, '/'); | 		strbuf_addch(base, '/'); | ||||||
| 		retval = diff_tree_sha1(sha1, sha2, base->buf, opt); | 		diff_tree_sha1(sha1, sha2, base->buf, opt); | ||||||
| 	} else { | 	} else { | ||||||
| 		opt->change(opt, mode1, mode2, sha1, sha2, base->buf, 0, 0); | 		opt->change(opt, mode1, mode2, sha1, sha2, base->buf, 0, 0); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Johannes Schindelin
						Johannes Schindelin