summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-17 17:25:55 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-17 17:25:55 -0700
commit253348b2dbb6519c82e6bc3543c652b9727771ed (patch)
tree27b77cb1cf424396f9c609ad062766411fe6adeb /git-compat-util.h
parentddd89c6f86210f18ce19198d163e05dfd311c5ce (diff)
parentfc1b56f054a79400c4e72cb1aab97ba2605cbd83 (diff)
downloadgit-253348b2dbb6519c82e6bc3543c652b9727771ed.tar.gz
Merge branch 'cb/maint-exec-error-report'
* cb/maint-exec-error-report: notice error exit from pager error_routine: use parent's stderr if exec fails
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index ddfbf77149..5ef8ff76f6 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -240,6 +240,7 @@ extern char *gitbasename(char *);
/* General helper functions */
extern void vreportf(const char *prefix, const char *err, va_list params);
+extern void vwritef(int fd, const char *prefix, const char *err, va_list params);
extern NORETURN void usage(const char *err);
extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
@@ -248,6 +249,7 @@ extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
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 int prefixcmp(const char *str, const char *prefix);
extern int suffixcmp(const char *str, const char *suffix);