diff options
author | Guy Harris <guy@alum.mit.edu> | 2012-11-30 13:03:21 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2012-11-30 13:03:21 -0800 |
commit | e47c0316559550a50aa1633f79a4bc53a2bc4655 (patch) | |
tree | cd369abcb78a769c1d5332caa5d0629ba3753044 | |
parent | 8c03626baa2c2fd900ecae96914329f98a316fbb (diff) |
Squelch format vs. argument warnings from clang.
-rw-r--r-- | bpf_image.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/bpf_image.c b/bpf_image.c index e2f1a774..e6c0f626 100644 --- a/bpf_image.c +++ b/bpf_image.c @@ -292,11 +292,14 @@ bpf_image(p, n) break; } (void)snprintf(operand, sizeof operand, fmt, v); - (void)snprintf(image, sizeof image, - (BPF_CLASS(p->code) == BPF_JMP && - BPF_OP(p->code) != BPF_JA) ? - "(%03d) %-8s %-16s jt %d\tjf %d" - : "(%03d) %-8s %s", - n, op, operand, n + 1 + p->jt, n + 1 + p->jf); + if (BPF_CLASS(p->code) == BPF_JMP && BPF_OP(p->code) != BPF_JA) { + (void)snprintf(image, sizeof image, + "(%03d) %-8s %-16s jt %d\tjf %d", + n, op, operand, n + 1 + p->jt, n + 1 + p->jf); + } else { + (void)snprintf(image, sizeof image, + "(%03d) %-8s %s", + n, op, operand); + } return image; } |