]> The Tcpdump Group git mirrors - libpcap/commitdiff
Squelch format vs. argument warnings from clang.
authorGuy Harris <[email protected]>
Fri, 30 Nov 2012 21:03:21 +0000 (13:03 -0800)
committerGuy Harris <[email protected]>
Fri, 30 Nov 2012 21:03:50 +0000 (13:03 -0800)
bpf_image.c

index e2f1a774a4f410ce17b0716d92494be3868ff218..e6c0f626174bcd341e1ac6e4f84f6399eab041cc 100644 (file)
@@ -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;
 }