From: Eric Sunshine <sunshine@sunshineco.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: Re: [PATCH v2 00/41] Add and use error_errno() and warning_errno()
Date: Tue, 3 May 2016 12:55:21 -0400 [thread overview]
Message-ID: <CAPig+cRb6w944VrniU-Wq9ET5kvPtYXyTqkUDrNzKS=JY-Qg-g@mail.gmail.com> (raw)
In-Reply-To: <1462277054-5943-1-git-send-email-pclouds@gmail.com>
On Tue, May 3, 2016 at 8:03 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
> Changes are in
>
> [01/41] usage.c: move format processing out of die_errno()
> [02/41] usage.c: add warning_errno() and error_errno()
> [12/41] builtin/update-index.c: prefer "err" to "errno" in process_lstat_error
> [17/41] compat/win32/syslog.c: use warning_errno()
> [27/41] grep.c: use error_errno()
>
> 12/41 is basically a revert with s/strerror(errno)/strerror(err)/.
> Interdiff from v1
The interdiff looks quite sensible. Thanks.
> -- 8< --
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index 0c539ed..b8b8522 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -251,11 +251,11 @@ static int remove_one_path(const char *path)
> * succeeds.
> * - permission error. That's never ok.
> */
> -static int process_lstat_error(const char *path)
> +static int process_lstat_error(const char *path, int err)
> {
> - if (errno == ENOENT || errno == ENOTDIR)
> + if (err == ENOENT || err == ENOTDIR)
> return remove_one_path(path);
> - return error_errno("lstat(\"%s\")", path);
> + return error("lstat(\"%s\"): %s", path, strerror(err));
> }
>
> static int add_one_path(const struct cache_entry *old, const char *path, int len, struct stat *st)
> @@ -382,7 +382,7 @@ static int process_path(const char *path)
> * what to do about the pathname!
> */
> if (lstat(path, &st) < 0)
> - return process_lstat_error(path);
> + return process_lstat_error(path, errno);
>
> if (S_ISDIR(st.st_mode))
> return process_directory(path, len, &st);
> diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c
> index 1c2ae18..6c7c9b6 100644
> --- a/compat/win32/syslog.c
> +++ b/compat/win32/syslog.c
> @@ -28,7 +28,7 @@ void syslog(int priority, const char *fmt, ...)
> va_end(ap);
>
> if (str_len < 0) {
> - warning_errno("vsnprintf failed:");
> + warning_errno("vsnprintf failed");
> return;
> }
>
> diff --git a/grep.c b/grep.c
> index 87c1890..4f3779a 100644
> --- a/grep.c
> +++ b/grep.c
> @@ -1732,7 +1732,7 @@ static int grep_source_load_file(struct grep_source *gs)
> if (lstat(filename, &st) < 0) {
> err_ret:
> if (errno != ENOENT)
> - error_errno(_("'%s'"), filename);
> + error_errno("'%s'", filename);
> return -1;
> }
> if (!S_ISREG(st.st_mode))
> diff --git a/usage.c b/usage.c
> index af1b7d1..1dad03f 100644
> --- a/usage.c
> +++ b/usage.c
> @@ -109,9 +109,8 @@ void NORETURN die(const char *err, ...)
> va_end(params);
> }
>
> -static const char *fmt_with_err(const char *fmt)
> +static const char *fmt_with_err(char *buf, int n, const char *fmt)
> {
> - static char fmt_with_err[1024];
> char str_error[256], *err;
> int i, j;
>
> @@ -129,12 +128,13 @@ static const char *fmt_with_err(const char *fmt)
> }
> }
> str_error[j] = 0;
> - snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, str_error);
> - return fmt_with_err;
> + snprintf(buf, n, "%s: %s", fmt, str_error);
> + return buf;
> }
>
> void NORETURN die_errno(const char *fmt, ...)
> {
> + char buf[1024];
> va_list params;
>
> if (die_is_recursing()) {
> @@ -144,16 +144,17 @@ void NORETURN die_errno(const char *fmt, ...)
> }
>
> va_start(params, fmt);
> - die_routine(fmt_with_err(fmt), params);
> + die_routine(fmt_with_err(buf, sizeof(buf), fmt), params);
> va_end(params);
> }
>
> int error_errno(const char *fmt, ...)
> {
> + char buf[1024];
> va_list params;
>
> va_start(params, fmt);
> - error_routine(fmt_with_err(fmt), params);
> + error_routine(fmt_with_err(buf, sizeof(buf), fmt), params);
> va_end(params);
> return -1;
> }
> @@ -171,10 +172,11 @@ int error(const char *err, ...)
>
> void warning_errno(const char *warn, ...)
> {
> + char buf[1024];
> va_list params;
>
> va_start(params, warn);
> - warn_routine(fmt_with_err(warn), params);
> + warn_routine(fmt_with_err(buf, sizeof(buf), warn), params);
> va_end(params);
> }
>
> -- 8< --
next prev parent reply other threads:[~2016-05-03 16:55 UTC|newest]
Thread overview: 145+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-01 11:14 [PATCH 00/41] Add and use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 01/41] usage.c: move format processing out of die_errno() Nguyễn Thái Ngọc Duy
2016-05-01 18:23 ` Eric Sunshine
2016-05-02 18:26 ` Junio C Hamano
2016-05-03 4:45 ` Jeff King
2016-05-03 9:39 ` Duy Nguyen
2016-05-03 10:15 ` Jeff King
2016-05-01 11:14 ` [PATCH 02/41] usage.c: add warning_errno() and error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 03/41] bisect.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 04/41] builtin/am.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 05/41] builtin/branch.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 06/41] builtin/fetch.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 07/41] builtin/help.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 08/41] builtin/mailsplit.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 18:31 ` Eric Sunshine
2016-05-01 11:14 ` [PATCH 09/41] builtin/merge-file.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 10/41] builtin/pack-objects.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 11/41] builtin/rm.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 12/41] builtin/update-index.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 18:40 ` Eric Sunshine
2016-05-02 8:47 ` Duy Nguyen
2016-05-01 11:14 ` [PATCH 13/41] builtin/upload-archive.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 14/41] builtin/worktree.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 15/41] check-racy.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 16/41] combine-diff.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 17/41] compat/win32/syslog.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 18:40 ` Eric Sunshine
2016-05-01 11:14 ` [PATCH 18/41] config.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 19/41] connected.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 20/41] copy.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 21/41] credential-cache--daemon.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 22/41] diff-no-index.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 23/41] editor.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 24/41] entry.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 25/41] fast-import.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 26/41] gpg-interface.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 27/41] grep.c: " Nguyễn Thái Ngọc Duy
2016-05-01 18:46 ` Eric Sunshine
2016-05-01 11:14 ` [PATCH 28/41] http.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 29/41] ident.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 30/41] mailmap.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 31/41] reachable.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 32/41] rerere.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 33/41] run-command.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 34/41] sequencer.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 35/41] server-info.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 36/41] sha1_file.c: use {error,die,warning}_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 37/41] transport-helper.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 38/41] unpack-trees.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 39/41] upload-pack.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 40/41] vcs-svn: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 41/41] wrapper.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:21 ` [PATCH 00/41] Add and use error_errno() and warning_errno() Duy Nguyen
2016-05-03 12:03 ` [PATCH v2 " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 01/41] usage.c: move format processing out of die_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 02/41] usage.c: add warning_errno() and error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 03/41] bisect.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 04/41] builtin/am.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 05/41] builtin/branch.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 06/41] builtin/fetch.c: " Nguyễn Thái Ngọc Duy
2016-05-03 19:22 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 07/41] builtin/help.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 08/41] builtin/mailsplit.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 19:48 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 09/41] builtin/merge-file.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 10/41] builtin/pack-objects.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 19:54 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 11/41] builtin/rm.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 19:58 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 12/41] builtin/update-index.c: prefer "err" to "errno" in process_lstat_error Nguyễn Thái Ngọc Duy
2016-05-03 16:52 ` Eric Sunshine
2016-05-03 12:03 ` [PATCH v2 13/41] builtin/upload-archive.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 14/41] builtin/worktree.c: " Nguyễn Thái Ngọc Duy
2016-05-03 20:02 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 15/41] check-racy.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 16/41] combine-diff.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 17/41] compat/win32/syslog.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 18/41] config.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 19/41] connected.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 20/41] copy.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 21/41] credential-cache--daemon.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 22/41] diff-no-index.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 23/41] editor.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 24/41] entry.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 25/41] fast-import.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 26/41] gpg-interface.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 27/41] grep.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 28/41] http.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 29/41] ident.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 30/41] mailmap.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 31/41] reachable.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 32/41] rerere.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 33/41] run-command.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 34/41] sequencer.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 35/41] server-info.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 36/41] sha1_file.c: use {error,die,warning}_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 37/41] transport-helper.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 38/41] unpack-trees.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 39/41] upload-pack.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 40/41] vcs-svn: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 41/41] wrapper.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 16:55 ` Eric Sunshine [this message]
2016-05-03 20:11 ` [PATCH v2 00/41] Add and use error_errno() and warning_errno() Junio C Hamano
2016-05-08 9:47 ` [PATCH v3 " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 01/41] usage.c: move format processing out of die_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 02/41] usage.c: add warning_errno() and error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 03/41] bisect.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 04/41] builtin/am.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 05/41] builtin/branch.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 06/41] builtin/fetch.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 07/41] builtin/help.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 08/41] builtin/mailsplit.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 09/41] builtin/merge-file.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 10/41] builtin/pack-objects.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 11/41] builtin/rm.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 12/41] builtin/update-index.c: prefer "err" to "errno" in process_lstat_error Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 13/41] builtin/upload-archive.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 14/41] builtin/worktree.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 15/41] check-racy.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 16/41] combine-diff.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 17/41] compat/win32/syslog.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 18/41] config.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 19/41] connected.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 20/41] copy.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 21/41] credential-cache--daemon.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 22/41] diff-no-index.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 23/41] editor.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 24/41] entry.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 25/41] fast-import.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 26/41] gpg-interface.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 27/41] grep.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 28/41] http.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 29/41] ident.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 30/41] mailmap.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 31/41] reachable.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 32/41] rerere.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 33/41] run-command.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 34/41] sequencer.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 35/41] server-info.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 36/41] sha1_file.c: use {error,die,warning}_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 37/41] transport-helper.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 38/41] unpack-trees.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 39/41] upload-pack.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:48 ` [PATCH v3 40/41] vcs-svn: " Nguyễn Thái Ngọc Duy
2016-05-08 9:48 ` [PATCH v3 41/41] wrapper.c: use warning_errno() Nguyễn Thái Ngọc Duy
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='CAPig+cRb6w944VrniU-Wq9ET5kvPtYXyTqkUDrNzKS=JY-Qg-g@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).