All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Karsten Blees" <karsten.blees@gmail.com>,
	"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
	"Stefan Beller" <sbeller@google.com>,
	"Matthieu Moy" <Matthieu.Moy@grenoble-inp.fr>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Johannes Sixt" <j6t@kdbg.org>, "René Scharfe" <l.s.r@web.de>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v7 32/40] write_or_die: use warning() instead of fprintf(stderr, ...)
Date: Mon, 13 Jun 2016 18:09:34 +0200	[thread overview]
Message-ID: <20160613160942.1806-33-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20160613160942.1806-1-chriscool@tuxfamily.org>

In write_or_whine_pipe() and write_or_whine() when write_in_full()
returns an error, let's print the errno related error message using
warning() instead of fprintf(stderr, ...).

This makes it possible to change the way it is handled by changing
the current warn routine in usage.c.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 write_or_die.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/write_or_die.c b/write_or_die.c
index 49e80aa..c29f677 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -87,8 +87,7 @@ int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
 {
 	if (write_in_full(fd, buf, count) < 0) {
 		check_pipe(errno);
-		fprintf(stderr, "%s: write error (%s)\n",
-			msg, strerror(errno));
+		warning("%s: write error (%s)\n", msg, strerror(errno));
 		return 0;
 	}
 
@@ -98,8 +97,7 @@ int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
 int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
 {
 	if (write_in_full(fd, buf, count) < 0) {
-		fprintf(stderr, "%s: write error (%s)\n",
-			msg, strerror(errno));
+		warning("%s: write error (%s)\n", msg, strerror(errno));
 		return 0;
 	}
 
-- 
2.9.0.rc2.411.g3e2ca28

  parent reply	other threads:[~2016-06-13 16:11 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-13 16:09 [PATCH v7 00/40] libify apply and use lib in am, part 2 Christian Couder
2016-06-13 16:09 ` [PATCH v7 01/40] apply: move 'struct apply_state' to apply.h Christian Couder
2016-06-13 22:49   ` Junio C Hamano
2016-06-14 11:07     ` Christian Couder
2016-06-13 16:09 ` [PATCH v7 02/40] builtin/apply: make apply_patch() return -1 instead of die()ing Christian Couder
2016-06-13 22:55   ` Junio C Hamano
2016-06-14 11:06     ` Christian Couder
2016-06-14 17:50       ` Junio C Hamano
2016-06-13 16:09 ` [PATCH v7 03/40] builtin/apply: read_patch_file() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 04/40] builtin/apply: make find_header() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 05/40] builtin/apply: make parse_chunk() return a negative integer on error Christian Couder
2016-06-13 16:09 ` [PATCH v7 06/40] builtin/apply: make parse_single_patch() return -1 " Christian Couder
2016-06-13 16:09 ` [PATCH v7 07/40] builtin/apply: make parse_whitespace_option() return -1 instead of die()ing Christian Couder
2016-06-13 16:09 ` [PATCH v7 08/40] builtin/apply: make parse_ignorewhitespace_option() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 09/40] builtin/apply: move init_apply_state() to apply.c Christian Couder
2016-06-13 16:09 ` [PATCH v7 10/40] apply: make init_apply_state() return -1 instead of exit()ing Christian Couder
2016-06-13 16:09 ` [PATCH v7 11/40] builtin/apply: make check_apply_state() return -1 instead of die()ing Christian Couder
2016-06-13 16:09 ` [PATCH v7 12/40] builtin/apply: move check_apply_state() to apply.c Christian Couder
2016-06-13 16:09 ` [PATCH v7 13/40] builtin/apply: make apply_all_patches() return -1 on error Christian Couder
2016-06-13 16:09 ` [PATCH v7 14/40] builtin/apply: make parse_traditional_patch() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 15/40] builtin/apply: make gitdiff_*() return 1 at end of header Christian Couder
2016-06-13 16:09 ` [PATCH v7 16/40] builtin/apply: make gitdiff_*() return -1 on error Christian Couder
2016-06-13 16:09 ` [PATCH v7 17/40] builtin/apply: change die_on_unsafe_path() to check_unsafe_path() Christian Couder
2016-06-13 16:09 ` [PATCH v7 18/40] builtin/apply: make build_fake_ancestor() return -1 on error Christian Couder
2016-06-13 16:09 ` [PATCH v7 19/40] builtin/apply: make remove_file() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 20/40] builtin/apply: make add_conflicted_stages_file() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 21/40] builtin/apply: make add_index_file() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 22/40] builtin/apply: make create_file() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 23/40] builtin/apply: make write_out_one_result() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 24/40] builtin/apply: make write_out_results() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 25/40] builtin/apply: make try_create_file() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 26/40] builtin/apply: make create_one_file() " Christian Couder
2016-06-13 16:09 ` [PATCH v7 27/40] builtin/apply: rename option parsing functions Christian Couder
2016-06-13 16:09 ` [PATCH v7 28/40] apply: rename and move opt constants to apply.h Christian Couder
2016-06-13 16:09 ` [PATCH v7 30/40] apply: make some parsing functions static again Christian Couder
2016-06-13 16:09 ` [PATCH v7 31/40] environment: add set_index_file() Christian Couder
2016-06-13 16:09 ` Christian Couder [this message]
2016-06-13 16:09 ` [PATCH v7 33/40] apply: add 'be_silent' variable to 'struct apply_state' Christian Couder
2016-06-13 16:09 ` [PATCH v7 34/40] apply: make 'be_silent' incompatible with 'apply_verbosely' Christian Couder
2016-06-13 16:09 ` [PATCH v7 35/40] apply: don't print on stdout when be_silent is set Christian Couder
2016-06-13 16:09 ` [PATCH v7 36/40] usage: add set_warn_routine() Christian Couder
2016-06-13 16:09 ` [PATCH v7 37/40] usage: add get_error_routine() and get_warn_routine() Christian Couder
2016-06-13 16:09 ` [PATCH v7 38/40] apply: change error_routine when be_silent is set Christian Couder
2016-06-13 16:09 ` [PATCH v7 39/40] builtin/am: use apply api in run_apply() Christian Couder
2016-06-13 16:09 ` [PATCH v7 40/40] apply: use error_errno() where possible Christian Couder
2016-06-13 16:16 ` [PATCH v7 00/40] libify apply and use lib in am, part 2 Christian Couder

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=20160613160942.1806-33-chriscool@tuxfamily.org \
    --to=christian.couder@gmail.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=avarab@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=karsten.blees@gmail.com \
    --cc=l.s.r@web.de \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sbeller@google.com \
    --cc=sunshine@sunshineco.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.