@matheusbsbs / matheus-bagliano / commits / fa39b6b5b1
Fork 0

Introduce a global level warn() function.

Like the existing error() function the new warn() function can be used to describe a situation that probably should not be occuring, but which the user (and Git) can continue to work around without running into too many problems. An example situation is a bad commit SHA1 found in a reflog. Attempting to read this record out of the reflog isn't really an error as we have skipped over it in the past. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Shawn O. Pearce committed Dec 21, 2006 at 19:48 UTC fa39b6b5b11f9b580c515a7b4a8e4eb8eaa79b75
2 files changed +21
git-compat-util.h
+2
@@ -71,10 +71,12 @@
71 extern void usage(const char *err) NORETURN;
72 extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
73 extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
74 +extern void warn(const char *err, ...) __attribute__((format (printf, 1, 2)));
75
76 extern void set_usage_routine(void (*routine)(const char *err) NORETURN);
77 extern void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN);
78 extern void set_error_routine(void (*routine)(const char *err, va_list params));
79 +extern void set_warn_routine(void (*routine)(const char *warn, va_list params));
80
81 #ifdef NO_MMAP
82
usage.c
+19
@@ -29,12 +29,17 @@ static void error_builtin(const char *err, va_list params)
29 report("error: ", err, params);
30 }
31
32 +static void warn_builtin(const char *warn, va_list params)
33 +{
34 + report("warning: ", warn, params);
35 +}
36
37 /* If we are in a dlopen()ed .so write to a global variable would segfault
38 * (ugh), so keep things static. */
39 static void (*usage_routine)(const char *err) NORETURN = usage_builtin;
40 static void (*die_routine)(const char *err, va_list params) NORETURN = die_builtin;
41 static void (*error_routine)(const char *err, va_list params) = error_builtin;
42 +static void (*warn_routine)(const char *err, va_list params) = warn_builtin;
43
44 void set_usage_routine(void (*routine)(const char *err) NORETURN)
45 {
@@ -51,6 +56,11 @@ void set_error_routine(void (*routine)(const char *err, va_list params))
56 error_routine = routine;
57 }
58
59 +void set_warn_routine(void (*routine)(const char *warn, va_list params))
60 +{
61 + warn_routine = routine;
62 +}
63 +
64
65 void usage(const char *err)
66 {
@@ -75,3 +85,12 @@ int error(const char *err, ...)
85 va_end(params);
86 return -1;
87 }
88 +
89 +void warn(const char *warn, ...)
90 +{
91 + va_list params;
92 +
93 + va_start(params, warn);
94 + warn_routine(warn, params);
95 + va_end(params);
96 +}