trace: correct variable name in write() error message
Our error message for write() always mentions GIT_TRACE, even though we may be writing for a different variable entirely. It's also not quite accurate to say "fd given by GIT_TRACE environment variable", as we may hit this error based on a filename the user put in the variable (we do complain and switch to stderr if the file cannot be opened, but it's still possible to hit a write() error on the descriptor later). So let's fix those things, and switch to our more usual "unable to do X: Y" format for the error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Aug 3, 2016 at 19:00 UTC
3b0c3ab777d7d1fc2fbfaba9ec8ce4d845428d99
1 file changed
+5
-5
trace.c
+5
-5
@@ -93,9 +93,6 @@ void trace_disable(struct trace_key *key)
93
key->need_close = 0;
94
}
95
96
-static const char err_msg[] = "could not trace into fd given by "
97
- "GIT_TRACE environment variable";
98
-
96
static int prepare_trace_line(const char *file, int line,
97
struct trace_key *key, struct strbuf *buf)
98
{
@@ -133,8 +130,11 @@ static int prepare_trace_line(const char *file, int line,
130
131
static void trace_write(struct trace_key *key, const void *buf, unsigned len)
132
{
136
- if (write_in_full(get_trace_fd(key), buf, len) < 0)
137
- warning("%s: write error (%s)", err_msg, strerror(errno));
133
+ if (write_in_full(get_trace_fd(key), buf, len) < 0) {
134
+ normalize_trace_key(&key);
135
+ warning("unable to write trace for %s: %s",
136
+ key->key, strerror(errno));
137
+ }
138
}
139
140
void trace_verbatim(struct trace_key *key, const void *buf, unsigned len)