зеркало из https://github.com/microsoft/git.git
trace: move code around, in preparation to file:line output
No functional changes, just move stuff around so that the next patch isn't that ugly... Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
b72be02cfb
Коммит
66f66c596f
54
trace.c
54
trace.c
|
@ -132,33 +132,6 @@ static void trace_vprintf(struct trace_key *key, const char *format, va_list ap)
|
|||
print_trace_line(key, &buf);
|
||||
}
|
||||
|
||||
void trace_printf_key(struct trace_key *key, const char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
trace_vprintf(key, format, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
void trace_printf(const char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
trace_vprintf(NULL, format, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
void trace_strbuf(struct trace_key *key, const struct strbuf *data)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
|
||||
if (!prepare_trace_line(key, &buf))
|
||||
return;
|
||||
|
||||
strbuf_addbuf(&buf, data);
|
||||
print_trace_line(key, &buf);
|
||||
}
|
||||
|
||||
void trace_argv_printf(const char **argv, const char *format, ...)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
|
@ -175,6 +148,33 @@ void trace_argv_printf(const char **argv, const char *format, ...)
|
|||
print_trace_line(NULL, &buf);
|
||||
}
|
||||
|
||||
void trace_strbuf(struct trace_key *key, const struct strbuf *data)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
|
||||
if (!prepare_trace_line(key, &buf))
|
||||
return;
|
||||
|
||||
strbuf_addbuf(&buf, data);
|
||||
print_trace_line(key, &buf);
|
||||
}
|
||||
|
||||
void trace_printf(const char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
trace_vprintf(NULL, format, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
void trace_printf_key(struct trace_key *key, const char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap, format);
|
||||
trace_vprintf(key, format, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
static const char *quote_crnl(const char *path)
|
||||
{
|
||||
static char new_path[PATH_MAX];
|
||||
|
|
12
trace.h
12
trace.h
|
@ -13,15 +13,19 @@ struct trace_key {
|
|||
|
||||
#define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name, 0, 0, 0 }
|
||||
|
||||
__attribute__((format (printf, 1, 2)))
|
||||
extern void trace_printf(const char *format, ...);
|
||||
__attribute__((format (printf, 2, 3)))
|
||||
extern void trace_argv_printf(const char **argv, const char *format, ...);
|
||||
extern void trace_repo_setup(const char *prefix);
|
||||
extern int trace_want(struct trace_key *key);
|
||||
extern void trace_disable(struct trace_key *key);
|
||||
|
||||
__attribute__((format (printf, 1, 2)))
|
||||
extern void trace_printf(const char *format, ...);
|
||||
|
||||
__attribute__((format (printf, 2, 3)))
|
||||
extern void trace_printf_key(struct trace_key *key, const char *format, ...);
|
||||
|
||||
__attribute__((format (printf, 2, 3)))
|
||||
extern void trace_argv_printf(const char **argv, const char *format, ...);
|
||||
|
||||
extern void trace_strbuf(struct trace_key *key, const struct strbuf *data);
|
||||
|
||||
#endif /* TRACE_H */
|
||||
|
|
Загрузка…
Ссылка в новой задаче