mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/unleak-fixes'

Browse Source 
Fix some incorrect UNLEAK() annotations.

* jk/unleak-fixes:
  ls-remote: simplify UNLEAK() usage
  stop calling UNLEAK() before die()
This commit is contained in:
Junio C Hamano
2020-08-24 14:54:30 -07:00
parent 11f433f79c 3e19816dc0
commit ff20794402
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/ls-remote.c
View File

@ -83,6 +83,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
PARSE_OPT_STOP_AT_NON_OPTION);
dest = argv[0];
UNLEAK(sorting);
if (argc > 1) {
int i;
pattern = xcalloc(argc, sizeof(const char *));
@ -107,7 +109,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
if (get_url) {
printf("%s\n", *remote->url);
UNLEAK(sorting);
return 0;
}
@ -122,10 +123,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
repo_set_hash_algo(the_repository, hash_algo);
}
if (transport_disconnect(transport)) {
UNLEAK(sorting);
if (transport_disconnect(transport))
return 1;
}
if (!dest && !quiet)
fprintf(stderr, "From %s\n", *remote->url);
@ -150,7 +149,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
status = 0; /* we found something */
}
UNLEAK(sorting);
ref_array_clear(&ref_array);
return status;
}