Compile with '-Wsign-compare' in devel mode if supported

[tcpdump] / print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index aef7063cf568fbd7776d88ff0541bfa7dfe0c765..41c82889761c8df55e8eb7c6b6e8ab9da8032f08 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -33,7 +33,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = " [|bootp]";
 
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1048.
@@ -361,10 +360,10 @@ bootp_print(netdissect_options *ndo,
        ND_TCHECK_1(bp->bp_sname);              /* check first char only */
        if (EXTRACT_U_1(bp->bp_sname)) {
                ND_PRINT("\n\t  sname \"");
-               if (fn_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname),
-                   ndo->ndo_snapend)) {
+               if (nd_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname),
+                               ndo->ndo_snapend) == 0) {
                        ND_PRINT("\"");
-                       ND_PRINT("%s", tstr + 1);
+                       nd_print_trunc(ndo);
                        return;
                }
                ND_PRINT("\"");
@@ -372,10 +371,10 @@ bootp_print(netdissect_options *ndo,
        ND_TCHECK_1(bp->bp_file);               /* check first char only */
        if (EXTRACT_U_1(bp->bp_file)) {
                ND_PRINT("\n\t  file \"");
-               if (fn_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file),
-                   ndo->ndo_snapend)) {
+               if (nd_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file),
+                               ndo->ndo_snapend) == 0) {
                        ND_PRINT("\"");
-                       ND_PRINT("%s", tstr + 1);
+                       nd_print_trunc(ndo);
                        return;
                }
                ND_PRINT("\"");
@@ -399,7 +398,7 @@ bootp_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /*
@@ -409,8 +408,8 @@ trunc:
  *     l - long (32 bits)
  *     L - unsigned long (32 bits)
  *     s - short (16 bits)
- *     b - period-seperated decimal bytes (variable length)
- *     x - colon-seperated hex bytes (variable length)
+ *     b - period-separated decimal bytes (variable length)
+ *     x - colon-separated hex bytes (variable length)
  *     a - ASCII string (variable length)
  *     B - on/off (8 bits)
  *     $ - special (explicit code to handle)
@@ -655,10 +654,7 @@ rfc1048_print(netdissect_options *ndo,
                                ND_PRINT(", occurs %u", ntag);
                }
 
-               if (!ND_TTEST_LEN(bp, len)) {
-                       ND_PRINT("[|rfc1048 %u]", len);
-                       return;
-               }
+               ND_TCHECK_LEN(bp, len);
 
                if (tag == TAG_DHCP_MESSAGE && len == 1) {
                        ND_PRINT("%s", tok2str(dhcp_msg_values, "Unknown (%u)", EXTRACT_U_1(bp)));
@@ -712,7 +708,7 @@ rfc1048_print(netdissect_options *ndo,
                case 'a':
                        /* ASCII strings */
                        ND_PRINT("\"");
-                       if (fn_printn(ndo, bp, len, ndo->ndo_snapend)) {
+                       if (nd_printn(ndo, bp, len, ndo->ndo_snapend)) {
                                ND_PRINT("\"");
                                goto trunc;
                        }
@@ -853,7 +849,7 @@ rfc1048_print(netdissect_options *ndo,
                                        ND_PRINT("%u/%u ", EXTRACT_U_1(bp), EXTRACT_U_1(bp + 1));
                                bp += 2;
                                ND_PRINT("\"");
-                               if (fn_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
+                               if (nd_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
                                        ND_PRINT("\"");
                                        goto trunc;
                                }
@@ -876,7 +872,7 @@ rfc1048_print(netdissect_options *ndo,
                                len--;
                                if (type == 0) {
                                        ND_PRINT("\"");
-                                       if (fn_printn(ndo, bp, len, ndo->ndo_snapend)) {
+                                       if (nd_printn(ndo, bp, len, ndo->ndo_snapend)) {
                                                ND_PRINT("\"");
                                                goto trunc;
                                        }
@@ -922,7 +918,7 @@ rfc1048_print(netdissect_options *ndo,
                                        case AGENT_SUBOPTION_CIRCUIT_ID: /* fall through */
                                        case AGENT_SUBOPTION_REMOTE_ID:
                                        case AGENT_SUBOPTION_SUBSCRIBER_ID:
-                                               if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
+                                               if (nd_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
                                                        goto trunc;
                                                break;
 
@@ -1020,7 +1016,7 @@ rfc1048_print(netdissect_options *ndo,
                                                break;
                                        }
                                        ND_PRINT("\"");
-                                       if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend)) {
+                                       if (nd_printn(ndo, bp, suboptlen, ndo->ndo_snapend)) {
                                                ND_PRINT("\"");
                                                goto trunc;
                                        }
@@ -1050,7 +1046,7 @@ rfc1048_print(netdissect_options *ndo,
        }
        return;
 trunc:
-       ND_PRINT("|[rfc1048]");
+       nd_print_trunc(ndo);
 }
 
 #define PRINTCMUADDR(m, s) { ND_TCHECK_4(&cmu->m); \
@@ -1083,7 +1079,7 @@ cmu_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 #undef PRINTCMUADDR