Skip to content

Commit 2aeafbc

Browse files
committed
Merge branch 'jt/trace-error-on-warning'
Like die() and error(), a call to warning() will also trigger a trace2 event. * jt/trace-error-on-warning: usage: add trace2 entry upon warning()
2 parents 3a0b884 + 0ee10fd commit 2aeafbc

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Documentation/technical/api-trace2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ completed.)
466466

467467
`"error"`::
468468
This event is emitted when one of the `error()`, `die()`,
469-
or `usage()` functions are called.
469+
`warning()`, or `usage()` functions are called.
470470
+
471471
------------
472472
{

usage.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ static void error_builtin(const char *err, va_list params)
8181

8282
static void warn_builtin(const char *warn, va_list params)
8383
{
84+
/*
85+
* We call this trace2 function first and expect it to va_copy 'params'
86+
* before using it (because an 'ap' can only be walked once).
87+
*/
88+
trace2_cmd_error_va(warn, params);
89+
8490
vreportf("warning: ", warn, params);
8591
}
8692

0 commit comments

Comments
 (0)