From: Jeff King Date: Wed, 3 Aug 2016 23:00:32 +0000 (-0400) Subject: trace: correct variable name in write() error message X-Git-Tag: v2.10.0-rc0~10^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3b0c3ab777d7d1fc2fbfaba9ec8ce4d845428d99?hp=--cc 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 Signed-off-by: Junio C Hamano --- 3b0c3ab777d7d1fc2fbfaba9ec8ce4d845428d99 diff --git a/trace.c b/trace.c index 4d68eb522f..4efb256fa2 100644 --- a/trace.c +++ b/trace.c @@ -93,9 +93,6 @@ void trace_disable(struct trace_key *key) key->need_close = 0; } -static const char err_msg[] = "could not trace into fd given by " - "GIT_TRACE environment variable"; - static int prepare_trace_line(const char *file, int line, struct trace_key *key, struct strbuf *buf) { @@ -133,8 +130,11 @@ static int prepare_trace_line(const char *file, int line, static void trace_write(struct trace_key *key, const void *buf, unsigned len) { - if (write_in_full(get_trace_fd(key), buf, len) < 0) - warning("%s: write error (%s)", err_msg, strerror(errno)); + if (write_in_full(get_trace_fd(key), buf, len) < 0) { + normalize_trace_key(&key); + warning("unable to write trace for %s: %s", + key->key, strerror(errno)); + } } void trace_verbatim(struct trace_key *key, const void *buf, unsigned len)