Avoid collison with error(), clean up code a bit.

[tcpdump] / print-wb.c

diff --git a/print-wb.c b/print-wb.c
index 3e3b06452eda646886d5fac13cba8f8fe7da580c..92b8c2c36691b7e2bdf2fcc94a16b87fbb76b044 100644 (file)
--- a/print-wb.c
+++ b/print-wb.c
@@ -47,8 +47,8 @@ static const char tstr[] = "[|wb]";
 #define DOP_ALIGN 4
 #define DOP_ROUNDUP(x) ((((int)(x)) + (DOP_ALIGN - 1)) & ~(DOP_ALIGN - 1))
 #define DOP_NEXT(d)\
-       ((struct dophdr *)((u_char *)(d) + \
-                         DOP_ROUNDUP(EXTRACT_16BITS(&(d)->dh_len) + sizeof(*(d)))))
+       ((const struct dophdr *)((const u_char *)(d) + \
+                               DOP_ROUNDUP(EXTRACT_16BITS(&(d)->dh_len) + sizeof(*(d)))))
 
 /*
  * Format of the whiteboard packet header.
@@ -199,11 +199,11 @@ wb_id(netdissect_options *ndo,
 
        nid = EXTRACT_16BITS(&id->pi_ps.nid);
        len -= sizeof(*io) * nid;
-       io = (struct id_off *)(id + 1);
-       cp = (char *)(io + nid);
-       if (!ND_TTEST2(cp, len)) {
+       io = (const struct id_off *)(id + 1);
+       cp = (const char *)(io + nid);
+       if (ND_TTEST2(cp, len)) {
                ND_PRINT((ndo, "\""));
-               fn_print(ndo, (u_char *)cp, (u_char *)cp + len);
+               fn_print(ndo, (const u_char *)cp, (const u_char *)cp + len);
                ND_PRINT((ndo, "\""));
        }
 
@@ -266,7 +266,7 @@ wb_prep(netdissect_options *ndo,
        }
        n = EXTRACT_32BITS(&prep->pp_n);
        ps = (const struct pgstate *)(prep + 1);
-       while (--n >= 0 && !ND_TTEST(*ps)) {
+       while (--n >= 0 && ND_TTEST(*ps)) {
                const struct id_off *io, *ie;
                char c = '<';
 
@@ -274,16 +274,16 @@ wb_prep(netdissect_options *ndo,
                    EXTRACT_32BITS(&ps->slot),
                    ipaddr_string(ndo, &ps->page.p_sid),
                    EXTRACT_32BITS(&ps->page.p_uid)));
-               io = (struct id_off *)(ps + 1);
-               for (ie = io + ps->nid; io < ie && !ND_TTEST(*io); ++io) {
+               io = (const struct id_off *)(ps + 1);
+               for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) {
                        ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id),
                            EXTRACT_32BITS(&io->off)));
                        c = ',';
                }
                ND_PRINT((ndo, ">"));
-               ps = (struct pgstate *)io;
+               ps = (const struct pgstate *)io;
        }
-       return ((u_char *)ps <= ep? 0 : -1);
+       return ((const u_char *)ps <= ep? 0 : -1);
 }
 
 
@@ -415,32 +415,32 @@ wb_print(netdissect_options *ndo,
                return;
 
        case PT_ID:
-               if (wb_id(ndo, (struct pkt_id *)(ph + 1), len) >= 0)
+               if (wb_id(ndo, (const struct pkt_id *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_RREQ:
-               if (wb_rreq(ndo, (struct pkt_rreq *)(ph + 1), len) >= 0)
+               if (wb_rreq(ndo, (const struct pkt_rreq *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_RREP:
-               if (wb_rrep(ndo, (struct pkt_rrep *)(ph + 1), len) >= 0)
+               if (wb_rrep(ndo, (const struct pkt_rrep *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_DRAWOP:
-               if (wb_drawop(ndo, (struct pkt_dop *)(ph + 1), len) >= 0)
+               if (wb_drawop(ndo, (const struct pkt_dop *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_PREQ:
-               if (wb_preq(ndo, (struct pkt_preq *)(ph + 1), len) >= 0)
+               if (wb_preq(ndo, (const struct pkt_preq *)(ph + 1), len) >= 0)
                        return;
                break;
 
        case PT_PREP:
-               if (wb_prep(ndo, (struct pkt_prep *)(ph + 1), len) >= 0)
+               if (wb_prep(ndo, (const struct pkt_prep *)(ph + 1), len) >= 0)
                        return;
                break;