undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server-info: simplify cleanup in parse_pack_def()

Browse Source 
We have two exits from the function: either we jump to the out_stale
label or not. But in both exits we repeat our cleanup, and the only
difference is our return value. Let's just use a variable for the return
value to avoid repeating ourselves.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2019-04-05 14:13:14 -04:00 committed by Junio C Hamano
parent b83a3089b5
commit 965cc517e5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server-info.c
View File

@ -133,6 +133,7 @@ static int read_pack_info_file(const char *infofile)
FILE *fp; FILE *fp;
char line[1000]; char line[1000];
int old_cnt = 0; int old_cnt = 0;
int stale = 1;
fp = fopen_or_warn(infofile, "r"); fp = fopen_or_warn(infofile, "r");
if (!fp) if (!fp)
@ -161,11 +162,11 @@ static int read_pack_info_file(const char *infofile)
error("unrecognized: %s", line); error("unrecognized: %s", line);
} }
} }
fclose(fp); stale = 0;
return 0;
out_stale: out_stale:
fclose(fp); fclose(fp);
return 1; return stale;
} }
static int compare_info(const void *a_, const void *b_) static int compare_info(const void *a_, const void *b_)