trace: consistently name the format parameter
The format parameter to trace_printf functions is sometimes abbreviated 'fmt'. Rename to 'format' everywhere (consistent with POSIX' printf specification). Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Karsten Blees committed
Jun 11, 2014 at 09:57 UTC
4a3b0b25f182727876bfb01748b2d00dd43f9ad7
2 files changed
+12
-12
trace.c
+11
-11
@@ -62,7 +62,7 @@ static int get_trace_fd(const char *key, int *need_close)
62
static const char err_msg[] = "Could not trace into fd given by "
63
"GIT_TRACE environment variable";
64
65
-static void trace_vprintf(const char *key, const char *fmt, va_list ap)
65
+static void trace_vprintf(const char *key, const char *format, va_list ap)
66
{
67
struct strbuf buf = STRBUF_INIT;
68
@@ -70,25 +70,25 @@ static void trace_vprintf(const char *key, const char *fmt, va_list ap)
70
return;
71
72
set_try_to_free_routine(NULL); /* is never reset */
73
- strbuf_vaddf(&buf, fmt, ap);
73
+ strbuf_vaddf(&buf, format, ap);
74
trace_strbuf(key, &buf);
75
strbuf_release(&buf);
76
}
77
78
__attribute__((format (printf, 2, 3)))
79
-void trace_printf_key(const char *key, const char *fmt, ...)
79
+void trace_printf_key(const char *key, const char *format, ...)
80
{
81
va_list ap;
82
- va_start(ap, fmt);
83
- trace_vprintf(key, fmt, ap);
82
+ va_start(ap, format);
83
+ trace_vprintf(key, format, ap);
84
va_end(ap);
85
}
86
87
-void trace_printf(const char *fmt, ...)
87
+void trace_printf(const char *format, ...)
88
{
89
va_list ap;
90
- va_start(ap, fmt);
91
- trace_vprintf("GIT_TRACE", fmt, ap);
90
+ va_start(ap, format);
91
+ trace_vprintf("GIT_TRACE", format, ap);
92
va_end(ap);
93
}
94
@@ -106,7 +106,7 @@ void trace_strbuf(const char *key, const struct strbuf *buf)
106
close(fd);
107
}
108
109
-void trace_argv_printf(const char **argv, const char *fmt, ...)
109
+void trace_argv_printf(const char **argv, const char *format, ...)
110
{
111
struct strbuf buf = STRBUF_INIT;
112
va_list ap;
@@ -117,8 +117,8 @@ void trace_argv_printf(const char **argv, const char *fmt, ...)
117
return;
118
119
set_try_to_free_routine(NULL); /* is never reset */
120
- va_start(ap, fmt);
121
- strbuf_vaddf(&buf, fmt, ap);
120
+ va_start(ap, format);
121
+ strbuf_vaddf(&buf, format, ap);
122
va_end(ap);
123
124
sq_quote_argv(&buf, argv, 0);
trace.h
+1
-1
@@ -11,7 +11,7 @@ extern void trace_argv_printf(const char **argv, const char *format, ...);
11
extern void trace_repo_setup(const char *prefix);
12
extern int trace_want(const char *key);
13
__attribute__((format (printf, 2, 3)))
14
-extern void trace_printf_key(const char *key, const char *fmt, ...);
14
+extern void trace_printf_key(const char *key, const char *format, ...);
15
extern void trace_strbuf(const char *key, const struct strbuf *buf);
16
17
#endif /* TRACE_H */