[PATCH v2 02/11] bisect--helper: introduce new `write_in_file()` function
From: Miriam Rubio <hidden>
Date: 2020-03-21 16:13:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
Let's refactor code adding a new `write_in_file()` function that opens a file for writing a message and closes it. This helper will be used in later steps and makes the code simpler and easier to understand. Mentored-by: Christian Couder [off-list ref] Mentored-by: Johannes Schindelin [off-list ref] Signed-off-by: Miriam Rubio <redacted> --- builtin/bisect--helper.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 1f81cff1d8..e949ea74e2 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c@@ -74,6 +74,26 @@ static int one_of(const char *term, ...) return res; } +static int write_in_file(const char *filepath, const char *mode, const char *format,...) +{ + FILE *fp = NULL; + va_list args; + int res = 0; + + if (!strcmp(mode, "a") && !strcmp(mode, "w")) + return error_errno(_("wrong writing mode '%s'"), mode); + fp = fopen(filepath, mode); + if (!fp) + return error_errno(_("could not open file '%s'"), filepath); + va_start(args, format); + res = vfprintf(fp, format, args); + va_end(args); + if (!res) + return error_errno(_("could not write to file '%s'"), filepath); + + return fclose(fp); +} + static int check_term_format(const char *term, const char *orig_term) { int res;
@@ -104,7 +124,6 @@ static int check_term_format(const char *term, const char *orig_term) static int write_terms(const char *bad, const char *good) { - FILE *fp = NULL; int res; if (!strcmp(bad, good))
@@ -113,12 +132,8 @@ static int write_terms(const char *bad, const char *good) if (check_term_format(bad, "bad") || check_term_format(good, "good")) return -1; - fp = fopen(git_path_bisect_terms(), "w"); - if (!fp) - return error_errno(_("could not open the file BISECT_TERMS")); + res = write_in_file(git_path_bisect_terms(), "w", "%s\n%s\n", bad, good); - res = fprintf(fp, "%s\n%s\n", bad, good); - res |= fclose(fp); return (res < 0) ? -1 : 0; }
--
2.25.0