From: Junio C Hamano <gitster@pobox.com>
To: Miriam Rubio <mirucam@gmail.com>
Cc: git@vger.kernel.org, Christian Couder <chriscool@tuxfamily.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2 02/11] bisect--helper: introduce new `write_in_file()` function
Date: Thu, 02 Apr 2020 22:13:43 -0700 [thread overview]
Message-ID: <xmqqeet51794.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200321161020.22817-3-mirucam@gmail.com> (Miriam Rubio's message of "Sat, 21 Mar 2020 17:10:11 +0100")
Miriam Rubio <mirucam@gmail.com> writes:
> 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;
It is crystal clear in this concise helper function that fp will
never be used without getting assigned the returned value from
fopen(), so I do not think there is any need to initialize it to
NULL.
I'd use "path", not "filepath" (which I do not think we use anywhere
in our codebase), if I were writing this function, by the way.
> + va_list args;
> + int res = 0;
> +
> + if (!strcmp(mode, "a") && !strcmp(mode, "w"))
> + return error_errno(_("wrong writing mode '%s'"), mode);
I do not see where you saw a failure from a call to system library
function, which would make 'errno' variable valid at this point, so
I am puzzled. By using error_errno(), whose error status are you
trying to show?
Puzzled. Shouldn't it be just error(_("..."), mode)?
> + fp = fopen(filepath, mode);
> + if (!fp)
> + return error_errno(_("could not open file '%s'"), filepath);
This one would show why fopen() failed, so error_errno() would be good.
Does it help us help the users if they can tell us which mode we failed
to write to the file? Something like
cannot open file '%s' in mode '%s'
perhaps?
> + va_start(args, format);
> + res = vfprintf(fp, format, args);
> + va_end(args);
> + if (!res)
> + return error_errno(_("could not write to file '%s'"), filepath);
This would show errors from vfprintf(), which is good. However, you
fail to fclose the FILE when this return is hit, which is not good.
> + 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;
> }
next prev parent reply other threads:[~2020-04-03 5: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 ` [PATCH v2 02/11] bisect--helper: introduce new `write_in_file()` function Miriam Rubio
2020-04-03 5:13 ` Junio C Hamano [this message]
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
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=xmqqeet51794.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=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).