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 01/10] bisect--helper: introduce new `write_in_file()` function
Date: Wed, 26 Feb 2020 11:14:20 +0100 [thread overview]
Message-ID: <20200226101429.81327-2-mirucam@gmail.com> (raw)
In-Reply-To: <20200226101429.81327-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 removes some duplicated code and makes the code simpler,
clearer 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 | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index c1c40b516d..ee1be630da 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -74,6 +74,19 @@ static int one_of(const char *term, ...)
return res;
}
+static int write_in_file(const char *filepath, const char *content, int append)
+{
+ FILE *fp = NULL;
+ const char *mode = append ? "a" : "w";
+
+ fp = fopen(filepath, mode);
+ if (!fp)
+ return error_errno(_("could not open the file '%s'"), filepath);
+ if (!fprintf(fp, "%s\n", content))
+ return error_errno(_("could not write in file '%s'"), filepath);
+ return fclose(fp);
+}
+
static int check_term_format(const char *term, const char *orig_term)
{
int res;
@@ -104,7 +117,7 @@ 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;
+ char *content = xstrfmt("%s\n%s", bad, good);
int res;
if (!strcmp(bad, good))
@@ -113,12 +126,9 @@ 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(), content, 0);
+ free(content);
- 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-02-26 10:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 10:14 [Outreachy][PATCH 00/10] Finish converting git bisect to C part 2 Miriam Rubio
2020-02-26 10:14 ` Miriam Rubio [this message]
2020-02-26 19:06 ` [PATCH 01/10] bisect--helper: introduce new `write_in_file()` function Junio C Hamano
2020-02-26 10:14 ` [PATCH 02/10] bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C Miriam Rubio
2020-02-26 19:34 ` Junio C Hamano
2020-02-27 15:34 ` Miriam R.
2020-02-27 16:41 ` Junio C Hamano
2020-03-06 18:19 ` Miriam R.
2020-03-06 19:05 ` Junio C Hamano
2020-03-11 18:58 ` Christian Couder
2020-02-26 10:14 ` [PATCH 03/10] bisect--helper: finish porting `bisect_start()` to C Miriam Rubio
2020-02-26 10:14 ` [PATCH 04/10] bisect--helper: retire `--bisect-clean-state` subcommand Miriam Rubio
2020-02-26 10:14 ` [PATCH 05/10] bisect--helper: retire `--next-all` subcommand Miriam Rubio
2020-02-26 10:14 ` [PATCH 06/10] bisect--helper: reimplement `bisect_autostart` shell function in C Miriam Rubio
2020-02-27 21:40 ` Johannes Schindelin
2020-02-26 10:14 ` [PATCH 07/10] bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions " Miriam Rubio
2020-02-27 23:12 ` Johannes Schindelin
2020-02-26 10:14 ` [PATCH 08/10] bisect--helper: retire `--check-expected-revs` subcommand Miriam Rubio
2020-02-26 10:14 ` [PATCH 09/10] bisect--helper: retire `--write-terms` subcommand Miriam Rubio
2020-02-26 10:14 ` [PATCH 10/10] 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200226101429.81327-2-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).