Commit Diff

Commit:
a6da5f6b0dd3ee6b20e16a313792d3618fa5839d
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
revert "clear the rest of the pack_fds pointers" There is no need to clear local variables before returning from a function. ok tracey
Actions:
Patch | Tree
commit - 4f1ecad819d7a7af32a43a0d4420d9db11c6052b
commit + a6da5f6b0dd3ee6b20e16a313792d3618fa5839d
blob - 7ebc07e303a583c4047c06f59ccdcf013bddf3f8
blob + 60476351c5599bd9549cccf48000ca54c8e8964e
--- got/got.c
+++ got/got.c
@@ -908,7 +908,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	if (preserve_logmsg) {
 		fprintf(stderr, "%s: log message preserved in %s\n",
@@ -1825,7 +1824,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	if (fetchpid > 0) {
 		if (kill(fetchpid, SIGTERM) == -1)
@@ -2652,7 +2650,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	TAILQ_FOREACH(pe, &refs, entry) {
 		free((void *)pe->path);
@@ -3095,7 +3092,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	if (head_ref)
 		got_ref_close(head_ref);
@@ -3348,7 +3344,6 @@ wrap_not_worktree_error(const struct got_error *orig_e
 		    got_repo_pack_fds_close(pack_fds);
 		if (err == NULL)
 			err = pack_err;
-		pack_fds = NULL;
 	}
 	return err;
 }
@@ -3534,7 +3529,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(worktree_path);
 	TAILQ_FOREACH(pe, &paths, entry)
@@ -4545,7 +4539,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	if (refs_idmap)
 		got_reflist_object_id_map_free(refs_idmap);
@@ -5155,7 +5148,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	TAILQ_FOREACH(pe, &paths, entry)
 		free((char *)pe->path);
@@ -5511,7 +5503,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	if (bca.lines) {
 		for (i = 0; i < bca.nlines; i++) {
@@ -5824,7 +5815,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	return error;
 }
@@ -5985,7 +5975,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 
 	TAILQ_FOREACH(pe, &paths, entry)
@@ -6282,7 +6271,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(cwd);
 	free(repo_path);
@@ -6722,7 +6710,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(cwd);
 	free(repo_path);
@@ -7258,7 +7245,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(cwd);
 	free(repo_path);
@@ -7399,7 +7385,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	TAILQ_FOREACH(pe, &paths, entry)
 		free((char *)pe->path);
@@ -7567,7 +7552,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	TAILQ_FOREACH(pe, &paths, entry)
 		free((char *)pe->path);
@@ -7757,7 +7741,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(cwd);
 	return error;
@@ -8035,7 +8018,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(path);
 	free(cwd);
@@ -8364,7 +8346,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(cwd);
 	free(id_str);
@@ -8919,7 +8900,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	if (ref)
 		got_ref_close(ref);
@@ -9047,7 +9027,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 
 	return error;
@@ -9162,7 +9141,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	return error;
 }
@@ -10125,7 +10103,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	return error;
 }
@@ -11513,7 +11490,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	return error;
 }
@@ -11667,7 +11643,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(cwd);
 	free(base_commit_id);
@@ -11950,7 +11925,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	return error;
 }
@@ -12111,7 +12085,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	TAILQ_FOREACH(pe, &paths, entry)
 		free((char *)pe->path);
@@ -12236,7 +12209,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	TAILQ_FOREACH(pe, &paths, entry)
 		free((char *)pe->path);
@@ -12599,7 +12571,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 
 	got_ref_list_free(&refs);
@@ -12794,7 +12765,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	TAILQ_FOREACH(pe, &paths, entry)
 		free((char *)pe->path);
blob - 6d8762d9be86470bcf1fcaecc8c45b6ce20bf04b
blob + b88d54df494f629ad336256ee0db5595bf370946
--- gotadmin/gotadmin.c
+++ gotadmin/gotadmin.c
@@ -379,7 +379,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 
 	free(repo_path);
@@ -767,7 +766,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	got_pathlist_free(&exclude_args);
 	got_ref_list_free(&exclude_refs);
@@ -861,7 +859,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(id_str);
 	free(pack_hash);
@@ -1052,7 +1049,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(id_str);
 	free(pack_hash);
@@ -1279,7 +1275,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(repo_path);
 	return error;
blob - 6e32519f91ea580135c286014f2fcb3a5a866331
blob + 2718272468dfb56884b51d1ccde716d356340aaf
--- tog/tog.c
+++ tog/tog.c
@@ -2952,7 +2952,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	tog_free_refs();
 	return error;
@@ -4078,7 +4077,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	tog_free_refs();
 	return error;
@@ -5067,7 +5065,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	tog_free_refs();
 	return error;
@@ -5951,7 +5948,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	tog_free_refs();
 	return error;
@@ -6685,7 +6681,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	tog_free_refs();
 	return error;
@@ -6846,7 +6841,6 @@ done:
 		    got_repo_pack_fds_close(pack_fds);
 		if (error == NULL)
 			error = pack_err;
-		pack_fds = NULL;
 	}
 	free(id);
 	free(commit_id_str);