git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org, Christian Couder <christian.couder@gmail.com>
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>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v6 39/44] usage: add get_error_routine() and get_warn_routine()
Date: Fri, 10 Jun 2016 22:11:13 +0200	[thread overview]
Message-ID: <20160610201118.13813-40-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20160610201118.13813-1-chriscool@tuxfamily.org>

Let's make it possible to get the current error_routine and warn_routine,
so that we can store them before using set_error_routine() or
set_warn_routine() to use new ones.

This way we will be able put back the original routines, when we are done
with using new ones.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 git-compat-util.h |  2 ++
 usage.c           | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/git-compat-util.h b/git-compat-util.h
index f78706a..92af27d 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -440,7 +440,9 @@ static inline int const_error(void)
 
 extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
 extern void set_error_routine(void (*routine)(const char *err, va_list params));
+extern void (*get_error_routine(void))(const char *err, va_list params);
 extern void set_warn_routine(void (*routine)(const char *warn, va_list params));
+extern void (*get_warn_routine(void))(const char *warn, va_list params);
 extern void set_die_is_recursing_routine(int (*routine)(void));
 extern void set_error_handle(FILE *);
 
diff --git a/usage.c b/usage.c
index 67e5526..2fd3045 100644
--- a/usage.c
+++ b/usage.c
@@ -70,11 +70,21 @@ void set_error_routine(void (*routine)(const char *err, va_list params))
 	error_routine = routine;
 }
 
+void (*get_error_routine(void))(const char *err, va_list params)
+{
+	return error_routine;
+}
+
 void set_warn_routine(void (*routine)(const char *warn, va_list params))
 {
 	warn_routine = routine;
 }
 
+void (*get_warn_routine(void))(const char *warn, va_list params)
+{
+	return warn_routine;
+}
+
 void set_die_is_recursing_routine(int (*routine)(void))
 {
 	die_is_recursing = routine;
-- 
2.9.0.rc2.362.g3cd93d0

  parent reply	other threads:[~2016-06-10 20:13 UTC|newest]

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

  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=20160610201118.13813-40-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=karsten.blees@gmail.com \
    --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.
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).