From: Miriam Rubio <mirucam@gmail.com>
To: git@vger.kernel.org
Cc: Miriam Rubio <mirucam@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH v2 02/11] bisect--helper: introduce new `write_in_file()` function
Date: Sat, 21 Mar 2020 17:10:11 +0100 [thread overview]
Message-ID: <20200321161020.22817-3-mirucam@gmail.com> (raw)
In-Reply-To: <20200321161020.22817-1-mirucam@gmail.com>
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 <chriscool@tuxfamily.org>
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Miriam Rubio <mirucam@gmail.com>
---
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
next prev parent reply other threads:[~2020-03-21 16:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-21 16:10 [PATCH v2 00/11] Finish converting git bisect to C part 2 Miriam Rubio
2020-03-21 16:10 ` [PATCH v2 01/11] bisect--helper: fix `cmd_*()` function switch default return Miriam Rubio
2020-04-03 4:58 ` Junio C Hamano
2020-04-03 13:17 ` Christian Couder
2020-04-03 18:30 ` Junio C Hamano
2020-03-21 16:10 ` Miriam Rubio [this message]
2020-04-03 5:13 ` [PATCH v2 02/11] bisect--helper: introduce new `write_in_file()` function Junio C Hamano
2020-03-21 16:10 ` [PATCH v2 03/11] bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C Miriam Rubio
2020-04-03 21:19 ` Junio C Hamano
2020-04-23 7:18 ` Miriam R.
2020-03-21 16:10 ` [PATCH v2 04/11] bisect--helper: finish porting `bisect_start()` to C Miriam Rubio
2020-03-21 16:10 ` [PATCH v2 05/11] bisect--helper: retire `--bisect-clean-state` subcommand Miriam Rubio
2020-03-21 16:10 ` [PATCH v2 06/11] bisect--helper: retire `--next-all` subcommand Miriam Rubio
2020-03-21 16:10 ` [PATCH v2 07/11] bisect--helper: reimplement `bisect_autostart` shell function in C Miriam Rubio
2020-03-21 16:10 ` [PATCH v2 08/11] bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions " Miriam Rubio
2020-03-21 16:10 ` [PATCH v2 09/11] bisect--helper: retire `--check-expected-revs` subcommand Miriam Rubio
2020-03-21 16:10 ` [PATCH v2 10/11] bisect--helper: retire `--write-terms` subcommand Miriam Rubio
2020-03-21 16:10 ` [PATCH v2 11/11] bisect--helper: retire `--bisect-autostart` subcommand Miriam Rubio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200321161020.22817-3-mirucam@gmail.com \
--to=mirucam@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).