This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=9b8f4296cf0b0f3a4aecc59d5d96d2b5f3ad2218 commit 9b8f4296cf0b0f3a4aecc59d5d96d2b5f3ad2218 Author: Guillem Jover <guil...@debian.org> AuthorDate: Tue Aug 25 01:13:12 2020 +0200 u-a: Refactor alternative database context freeing into a new function Changelog: internal --- utils/update-alternatives.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c index 71e4879d6..b98fbe1a6 100644 --- a/utils/update-alternatives.c +++ b/utils/update-alternatives.c @@ -1229,6 +1229,14 @@ struct altdb_context { jmp_buf on_error; }; +static void +altdb_context_free(struct altdb_context *ctx) +{ + if (ctx->fh) + fclose(ctx->fh); + free(ctx->filename); +} + static int altdb_filter_namelist(const struct dirent *entry) { @@ -1464,9 +1472,7 @@ alternative_load(struct alternative *a, enum altdb_flags flags) } if (setjmp(ctx.on_error)) { - if (ctx.fh) - fclose(ctx.fh); - free(ctx.filename); + altdb_context_free(&ctx); alternative_reset(a); return false; } -- Dpkg.Org's dpkg
