diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-01-31 00:43:45 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-01-31 00:43:45 -0800 |
| commit | 0dad1934af3db3f97d4371463089c8725dbfa26d (patch) | |
| tree | eaedbdb157d6aae6e44ade1830a6144b08a1eaaf /print-wb.c | |
| parent | 44c822e9f671b7a9b2e52b781cdbf38933cbdeaf (diff) | |
| download | tcpdump-0dad1934af3db3f97d4371463089c8725dbfa26d.tar.gz | |
Have ip{6}addr_string take a u_char * as the second argument.
Fix warnings that introduces.
Diffstat (limited to 'print-wb.c')
| -rw-r--r-- | print-wb.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -193,10 +193,10 @@ wb_id(netdissect_options *ndo, ND_PRINT(" %u/%s:%u (max %u/%s:%u) ", EXTRACT_BE_U_4(id->pi_ps.slot), - ipaddr_string(ndo, &id->pi_ps.page.p_sid), + ipaddr_string(ndo, id->pi_ps.page.p_sid), EXTRACT_BE_U_4(id->pi_ps.page.p_uid), EXTRACT_BE_U_4(id->pi_mslot), - ipaddr_string(ndo, &id->pi_mpage.p_sid), + ipaddr_string(ndo, id->pi_mpage.p_sid), EXTRACT_BE_U_4(id->pi_mpage.p_uid)); nid = EXTRACT_BE_U_2(id->pi_ps.nid); @@ -212,7 +212,7 @@ wb_id(netdissect_options *ndo, c = '<'; for (i = 0; i < nid && ND_TTEST_SIZE(io); ++io, ++i) { ND_PRINT("%c%s:%u", - c, ipaddr_string(ndo, &io->id), EXTRACT_BE_U_4(io->off)); + c, ipaddr_string(ndo, io->id), EXTRACT_BE_U_4(io->off)); c = ','; } if (i >= nid) { @@ -231,8 +231,8 @@ wb_rreq(netdissect_options *ndo, return (-1); ND_PRINT(" please repair %s %s:%u<%u:%u>", - ipaddr_string(ndo, &rreq->pr_id), - ipaddr_string(ndo, &rreq->pr_page.p_sid), + ipaddr_string(ndo, rreq->pr_id), + ipaddr_string(ndo, rreq->pr_page.p_sid), EXTRACT_BE_U_4(rreq->pr_page.p_uid), EXTRACT_BE_U_4(rreq->pr_sseq), EXTRACT_BE_U_4(rreq->pr_eseq)); @@ -249,7 +249,7 @@ wb_preq(netdissect_options *ndo, ND_PRINT(" need %u/%s:%u", EXTRACT_BE_U_4(preq->pp_low), - ipaddr_string(ndo, &preq->pp_page.p_sid), + ipaddr_string(ndo, preq->pp_page.p_sid), EXTRACT_BE_U_4(preq->pp_page.p_uid)); return (0); } @@ -273,11 +273,11 @@ wb_prep(netdissect_options *ndo, ND_PRINT(" %u/%s:%u", EXTRACT_BE_U_4(ps->slot), - ipaddr_string(ndo, &ps->page.p_sid), + ipaddr_string(ndo, ps->page.p_sid), EXTRACT_BE_U_4(ps->page.p_uid)); io = (const struct id_off *)(ps + 1); for (ie = io + EXTRACT_U_1(ps->nid); io < ie && ND_TTEST_SIZE(io); ++io) { - ND_PRINT("%c%s:%u", c, ipaddr_string(ndo, &io->id), + ND_PRINT("%c%s:%u", c, ipaddr_string(ndo, io->id), EXTRACT_BE_U_4(io->off)); c = ','; } @@ -357,8 +357,8 @@ wb_rrep(netdissect_options *ndo, len -= sizeof(*rrep); ND_PRINT(" for %s %s:%u<%u:%u>", - ipaddr_string(ndo, &rrep->pr_id), - ipaddr_string(ndo, &dop->pd_page.p_sid), + ipaddr_string(ndo, rrep->pr_id), + ipaddr_string(ndo, dop->pd_page.p_sid), EXTRACT_BE_U_4(dop->pd_page.p_uid), EXTRACT_BE_U_4(dop->pd_sseq), EXTRACT_BE_U_4(dop->pd_eseq)); @@ -380,7 +380,7 @@ wb_drawop(netdissect_options *ndo, len -= sizeof(*dop); ND_PRINT(" %s:%u<%u:%u>", - ipaddr_string(ndo, &dop->pd_page.p_sid), + ipaddr_string(ndo, dop->pd_page.p_sid), EXTRACT_BE_U_4(dop->pd_page.p_uid), EXTRACT_BE_U_4(dop->pd_sseq), EXTRACT_BE_U_4(dop->pd_eseq)); |