From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Miriam Rubio <mirucam@gmail.com>
Cc: git@vger.kernel.org, Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH v3 03/12] bisect--helper: introduce new `write_in_file()` function
Date: Fri, 22 May 2020 15:25:05 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2005221516540.56@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200423070704.39872-4-mirucam@gmail.com>
Hi Miriam,
On Thu, 23 Apr 2020, Miriam Rubio wrote:
> Let's refactor code adding a new `write_in_file()` function
> that opens a file for writing a message and closes it.
Don't we have that already?
https://github.com/git/git/blob/v2.27.0-rc1/wrapper.c#L625-L638
If that function does not meet the bill, it would make more sense to
extend it (or refactor it, providing a new global function that does meet
the bill).
> This helper will be used in later steps and makes the code
> simpler and easier to understand.
Makes a lot of sense to me!
> 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 | 29 +++++++++++++++++++++++------
> 1 file changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> index 0fbd924aac..d3b2b33df0 100644
> --- a/builtin/bisect--helper.c
> +++ b/builtin/bisect--helper.c
> @@ -74,6 +74,28 @@ static int one_of(const char *term, ...)
> return res;
> }
>
> +static int write_in_file(const char *path, const char *mode, const char *format,...)
I wonder whether there is _ever_ a case where we want to set `mode` to
anything else than `"w"`? Ah...
> +{
> + FILE *fp = NULL;
> + va_list args;
> + int res = 0;
> +
> + if (!strcmp(mode, "a") && !strcmp(mode, "w"))
> + return error(_("wrong writing mode '%s'"), mode);
... rather than doing this, I would prefer a pair of functions (that can
call the same helper function doing the actual work): `write_to_file()`
and `append_to_file()`.
Apart from that, the patch looks good to me,
Dscho
> + fp = fopen(path, mode);
> + if (!fp)
> + return error_errno(_("cannot open file '%s' in mode '%s'"), path, mode);
> + va_start(args, format);
> + res = vfprintf(fp, format, args);
> + va_end(args);
> + if (!res) {
> + fclose(fp);
> + return error_errno(_("could not write to file '%s'"), path);
> + }
> +
> + return fclose(fp);
> +}
> +
> static int check_term_format(const char *term, const char *orig_term)
> {
> int res;
> @@ -104,7 +126,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 +134,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-05-22 13:25 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 7:06 [PATCH v3 00/12] Finish converting git bisect to C part 2 Miriam Rubio
2020-04-23 7:06 ` [PATCH v3 01/12] bisect--helper: fix `cmd_*()` function switch default return Miriam Rubio
2020-05-22 13:14 ` Johannes Schindelin
2020-04-23 7:06 ` [PATCH v3 02/12] bisect--helper: use '-res' in 'cmd_bisect__helper' return Miriam Rubio
2020-05-22 13:16 ` Johannes Schindelin
2020-04-23 7:06 ` [PATCH v3 03/12] bisect--helper: introduce new `write_in_file()` function Miriam Rubio
2020-05-22 13:25 ` Johannes Schindelin [this message]
2020-05-23 1:53 ` Đoàn Trần Công Danh
2020-04-23 7:06 ` [PATCH v3 04/12] bisect--helper: reimplement `bisect_autostart` shell function in C Miriam Rubio
2020-05-22 19:27 ` Johannes Schindelin
2020-05-22 20:50 ` Johannes Schindelin
2020-04-23 7:06 ` [PATCH v3 05/12] bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions " Miriam Rubio
2020-05-22 20:47 ` Johannes Schindelin
2020-04-23 7:06 ` [PATCH v3 06/12] bisect--helper: finish porting `bisect_start()` to C Miriam Rubio
2020-05-22 21:08 ` Johannes Schindelin
2020-04-23 7:06 ` [PATCH v3 07/12] bisect--helper: retire `--bisect-clean-state` subcommand Miriam Rubio
2020-04-23 7:07 ` [PATCH v3 08/12] bisect--helper: retire `--next-all` subcommand Miriam Rubio
2020-04-23 7:07 ` [PATCH v3 09/12] bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C Miriam Rubio
2020-05-22 22:06 ` Johannes Schindelin
2020-06-20 8:04 ` Miriam R.
2020-06-19 13:57 ` Johannes Schindelin
2020-04-23 7:07 ` [PATCH v3 10/12] bisect--helper: retire `--check-expected-revs` subcommand Miriam Rubio
2020-04-23 7:07 ` [PATCH v3 11/12] bisect--helper: retire `--write-terms` subcommand Miriam Rubio
2020-04-23 7:07 ` [PATCH v3 12/12] bisect--helper: retire `--bisect-autostart` subcommand Miriam Rubio
2020-04-23 20:01 ` [PATCH v3 00/12] Finish converting git bisect to C part 2 Junio C Hamano
2020-04-25 10:57 ` Miriam R.
2020-05-22 22:09 ` Johannes Schindelin
2020-05-24 21:19 ` Miriam R.
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=nycvar.QRO.7.76.6.2005221516540.56@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=mirucam@gmail.com \
/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).