btf_encoder: Adopt btf__log_func_param() and use encoder->verbose

This will eventually allow us to remove one more global variable,
btf_encoder__verbose.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2021-06-09 10:27:57 -03:00
parent 729da7613b
commit 4ffa484b6a
1 changed files with 6 additions and 8 deletions

View File

@ -183,14 +183,13 @@ static void btf_encoder__log_member(const struct btf_encoder *encoder, const str
fprintf(out, "\n");
}
__attribute ((format (printf, 5, 6)))
static void btf__log_func_param(const char *name, uint32_t type,
bool err, bool is_last_param,
const char *fmt, ...)
__attribute ((format (printf, 6, 7)))
static void btf_encoder__log_func_param(struct btf_encoder *encoder, const char *name, uint32_t type,
bool err, bool is_last_param, const char *fmt, ...)
{
FILE *out;
if (!btf_encoder__verbose && !err)
if (!encoder->verbose && !err)
return;
out = err ? stderr : stdout;
@ -453,11 +452,10 @@ static int32_t btf_encoder__add_func_param(struct btf_encoder *encoder, const ch
int err = btf__add_func_param(encoder->btf, name, type);
if (!err) {
btf__log_func_param(name, type, false, is_last_param, NULL);
btf_encoder__log_func_param(encoder, name, type, false, is_last_param, NULL);
return 0;
} else {
btf__log_func_param(name, type, true, is_last_param,
"Error adding func param");
btf_encoder__log_func_param(encoder, name, type, true, is_last_param, "Error adding func param");
return -1;
}
}