On Tue, Jun 21, 2011 at 02:27:45PM -0400, Ted Unangst wrote:
> more casts, not needed.
sure. ok krw@.
.... Ken
>
> Index: pci/if_bge.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_bge.c,v
> retrieving revision 1.306
> diff -u -r1.306 if_bge.c
> --- pci/if_bge.c 5 Apr 2011 18:01:21 -0000 1.306
> +++ pci/if_bge.c 21 Jun 2011 18:02:02 -0000
> @@ -866,7 +866,7 @@
> sc->bge_dev.dv_xname, i);
> goto uncreate;
> }
> - bzero((char *)&sc->bge_rdata->bge_rx_std_ring[i],
> + bzero(&sc->bge_rdata->bge_rx_std_ring[i],
> sizeof(struct bge_rx_bd));
> }
>
> @@ -952,7 +952,7 @@
> }
> bus_dmamap_destroy(sc->bge_dmatag, dmap);
> sc->bge_cdata.bge_rx_std_map[i] = NULL;
> - bzero((char *)&sc->bge_rdata->bge_rx_std_ring[i],
> + bzero(&sc->bge_rdata->bge_rx_std_ring[i],
> sizeof(struct bge_rx_bd));
> }
>
> @@ -976,7 +976,7 @@
> sc->bge_dev.dv_xname, i);
> goto uncreate;
> }
> - bzero((char *)&sc->bge_rdata->bge_rx_jumbo_ring[i],
> + bzero(&sc->bge_rdata->bge_rx_jumbo_ring[i],
> sizeof(struct bge_ext_rx_bd));
> }
>
> @@ -1051,7 +1051,7 @@
> }
> bus_dmamap_destroy(sc->bge_dmatag, dmap);
> sc->bge_cdata.bge_rx_jumbo_map[i] = NULL;
> - bzero((char *)&sc->bge_rdata->bge_rx_jumbo_ring[i],
> + bzero(&sc->bge_rdata->bge_rx_jumbo_ring[i],
> sizeof(struct bge_ext_rx_bd));
> }
>
> @@ -1075,7 +1075,7 @@
> link);
> sc->txdma[i] = 0;
> }
> - bzero((char *)&sc->bge_rdata->bge_tx_ring[i],
> + bzero(&sc->bge_rdata->bge_tx_ring[i],
> sizeof(struct bge_tx_bd));
> }
>
> @@ -2907,9 +2907,7 @@
>
> /* Internal frag. If fits in prev, copy it there. */
> if (prev && M_TRAILINGSPACE(prev) >= m->m_len) {
> - bcopy(m->m_data,
> - prev->m_data+prev->m_len,
> - mlen);
> + bcopy(m->m_data, prev->m_data+prev->m_len, mlen);
> prev->m_len += mlen;
> m->m_len = 0;
> /* XXX stitch chain */
> @@ -2921,9 +2919,7 @@
> m->m_next->m_len >= (8 + shortfall)) {
> /* m is writable and have enough data in next, pull up.
> */
>
> - bcopy(m->m_next->m_data,
> - m->m_data+m->m_len,
> - shortfall);
> + bcopy(m->m_next->m_data, m->m_data+m->m_len, shortfall);
> m->m_len += shortfall;
> m->m_next->m_len -= shortfall;
> m->m_next->m_data += shortfall;
> Index: pci/if_bnx.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_bnx.c,v
> retrieving revision 1.94
> diff -u -r1.94 if_bnx.c
> --- pci/if_bnx.c 18 Apr 2011 04:27:31 -0000 1.94
> +++ pci/if_bnx.c 21 Jun 2011 18:02:17 -0000
> @@ -3914,7 +3914,7 @@
>
> /* Clear each TX chain page. */
> for (i = 0; i < TX_PAGES; i++)
> - bzero((char *)sc->tx_bd_chain[i], BNX_TX_CHAIN_PAGE_SZ);
> + bzero(sc->tx_bd_chain[i], BNX_TX_CHAIN_PAGE_SZ);
>
> sc->used_tx_bd = 0;
>
> @@ -4130,7 +4130,7 @@
>
> /* Clear each RX chain page. */
> for (i = 0; i < RX_PAGES; i++)
> - bzero((char *)sc->rx_bd_chain[i], BNX_RX_CHAIN_PAGE_SZ);
> + bzero(sc->rx_bd_chain[i], BNX_RX_CHAIN_PAGE_SZ);
>
> sc->free_rx_bd = sc->max_rx_bd;
>
> Index: pci/if_lge.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_lge.c,v
> retrieving revision 1.54
> diff -u -r1.54 if_lge.c
> --- pci/if_lge.c 3 Apr 2011 15:36:02 -0000 1.54
> +++ pci/if_lge.c 21 Jun 2011 18:02:38 -0000
> @@ -499,7 +499,7 @@
> */
> printf(", address %s\n", ether_sprintf(eaddr));
>
> - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
> + bcopy(eaddr, &sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
>
> sc->sc_dmatag = pa->pa_dmat;
> DPRINTFN(5, ("bus_dmamem_alloc\n"));
> @@ -1480,8 +1480,7 @@
> sc->lge_ldata->lge_rx_list[i].lge_mbuf = NULL;
> }
> }
> - bzero((char *)&sc->lge_ldata->lge_rx_list,
> - sizeof(sc->lge_ldata->lge_rx_list));
> + bzero(&sc->lge_ldata->lge_rx_list, sizeof(sc->lge_ldata->lge_rx_list));
>
> /*
> * Free the TX list buffers.
> @@ -1493,6 +1492,5 @@
> }
> }
>
> - bzero((char *)&sc->lge_ldata->lge_tx_list,
> - sizeof(sc->lge_ldata->lge_tx_list));
> + bzero(&sc->lge_ldata->lge_tx_list, sizeof(sc->lge_ldata->lge_tx_list));
> }
> Index: pci/if_msk.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_msk.c,v
> retrieving revision 1.92
> diff -u -r1.92 if_msk.c
> --- pci/if_msk.c 3 Apr 2011 15:36:02 -0000 1.92
> +++ pci/if_msk.c 21 Jun 2011 18:02:56 -0000
> @@ -430,8 +430,7 @@
> struct msk_ring_data *rd = sc_if->sk_rdata;
> int i, nexti;
>
> - bzero((char *)rd->sk_rx_ring,
> - sizeof(struct msk_rx_desc) * MSK_RX_RING_CNT);
> + bzero(rd->sk_rx_ring, sizeof(struct msk_rx_desc) * MSK_RX_RING_CNT);
>
> for (i = 0; i < MSK_RX_RING_CNT; i++) {
> cd->sk_rx_chain[i].sk_le = &rd->sk_rx_ring[i];
> @@ -460,7 +459,7 @@
> struct sk_txmap_entry *entry;
> int i, nexti;
>
> - bzero((char *)sc_if->sk_rdata->sk_tx_ring,
> + bzero(sc_if->sk_rdata->sk_tx_ring,
> sizeof(struct msk_tx_desc) * MSK_TX_RING_CNT);
>
> SIMPLEQ_INIT(&sc_if->sk_txmap_head);
> @@ -771,7 +770,7 @@
> }
>
> /* Reset status ring. */
> - bzero((char *)sc->sk_status_ring,
> + bzero(sc->sk_status_ring,
> MSK_STATUS_RING_CNT * sizeof(struct msk_status_desc));
> sc->sk_status_idx = 0;
>
> Index: pci/if_nge.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_nge.c,v
> retrieving revision 1.70
> diff -u -r1.70 if_nge.c
> --- pci/if_nge.c 20 Sep 2010 07:40:38 -0000 1.70
> +++ pci/if_nge.c 21 Jun 2011 18:03:17 -0000
> @@ -540,7 +540,7 @@
>
> DPRINTFN(9, ("%s: nge_miibus_readreg\n", sc->sc_dv.dv_xname));
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -560,7 +560,7 @@
>
> DPRINTFN(9, ("%s: nge_miibus_writereg\n", sc->sc_dv.dv_xname));
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -828,7 +828,7 @@
> */
> printf(", address %s\n", ether_sprintf(eaddr));
>
> - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
> + bcopy(eaddr, &sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
>
> sc->sc_dmatag = pa->pa_dmat;
> DPRINTFN(5, ("%s: bus_dmamem_alloc\n", sc->sc_dv.dv_xname));
> @@ -2202,7 +2202,7 @@
> sc->nge_ldata->nge_rx_list[i].nge_mbuf = NULL;
> }
> }
> - bzero((char *)&sc->nge_ldata->nge_rx_list,
> + bzero(&sc->nge_ldata->nge_rx_list,
> sizeof(sc->nge_ldata->nge_rx_list));
>
> /*
> @@ -2215,7 +2215,7 @@
> }
> }
>
> - bzero((char *)&sc->nge_ldata->nge_tx_list,
> + bzero(&sc->nge_ldata->nge_tx_list,
> sizeof(sc->nge_ldata->nge_tx_list));
> }
>
> Index: pci/if_sis.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_sis.c,v
> retrieving revision 1.104
> diff -u -r1.104 if_sis.c
> --- pci/if_sis.c 14 Apr 2011 06:27:52 -0000 1.104
> +++ pci/if_sis.c 21 Jun 2011 18:03:41 -0000
> @@ -607,7 +607,7 @@
>
> return (val);
> } else {
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -655,7 +655,7 @@
> printf("%s: PHY failed to come ready\n",
> sc->sc_dev.dv_xname);
> } else {
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -1017,7 +1017,7 @@
> tmp[2] = letoh16(sis_reverse(tmp[2]));
> tmp[1] = letoh16(sis_reverse(tmp[1]));
>
> - bcopy((char *)&tmp[1], sc->arpcom.ac_enaddr,
> + bcopy(&tmp[1], sc->arpcom.ac_enaddr,
> ETHER_ADDR_LEN);
> }
> break;
> @@ -1980,7 +1980,7 @@
> m_freem(sc->sis_ldata->sis_rx_list[i].sis_mbuf);
> sc->sis_ldata->sis_rx_list[i].sis_mbuf = NULL;
> }
> - bzero((char *)&sc->sis_ldata->sis_rx_list[i],
> + bzero(&sc->sis_ldata->sis_rx_list[i],
> sizeof(struct sis_desc) - sizeof(bus_dmamap_t));
> }
>
> @@ -1999,7 +1999,7 @@
> m_freem(sc->sis_ldata->sis_tx_list[i].sis_mbuf);
> sc->sis_ldata->sis_tx_list[i].sis_mbuf = NULL;
> }
> - bzero((char *)&sc->sis_ldata->sis_tx_list[i],
> + bzero(&sc->sis_ldata->sis_tx_list[i],
> sizeof(struct sis_desc) - sizeof(bus_dmamap_t));
> }
> }
> Index: pci/if_sk.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_sk.c,v
> retrieving revision 1.159
> diff -u -r1.159 if_sk.c
> --- pci/if_sk.c 3 Apr 2011 15:36:02 -0000 1.159
> +++ pci/if_sk.c 21 Jun 2011 18:03:53 -0000
> @@ -558,8 +558,7 @@
> struct sk_ring_data *rd = sc_if->sk_rdata;
> int i, nexti;
>
> - bzero((char *)rd->sk_rx_ring,
> - sizeof(struct sk_rx_desc) * SK_RX_RING_CNT);
> + bzero(rd->sk_rx_ring, sizeof(struct sk_rx_desc) * SK_RX_RING_CNT);
>
> for (i = 0; i < SK_RX_RING_CNT; i++) {
> cd->sk_rx_chain[i].sk_desc = &rd->sk_rx_ring[i];
> @@ -599,7 +598,7 @@
> struct sk_txmap_entry *entry;
> int i, nexti;
>
> - bzero((char *)sc_if->sk_rdata->sk_tx_ring,
> + bzero(sc_if->sk_rdata->sk_tx_ring,
> sizeof(struct sk_tx_desc) * SK_TX_RING_CNT);
>
> SIMPLEQ_INIT(&sc_if->sk_txmap_head);
> Index: pci/if_ste.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_ste.c,v
> retrieving revision 1.46
> diff -u -r1.46 if_ste.c
> --- pci/if_ste.c 3 Apr 2011 15:36:03 -0000 1.46
> +++ pci/if_ste.c 21 Jun 2011 18:04:06 -0000
> @@ -338,7 +338,7 @@
> if (sc->ste_one_phy && phy != 0)
> return (0);
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -353,7 +353,7 @@
> struct ste_softc *sc = (struct ste_softc *)self;
> struct ste_mii_frame frame;
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -1077,8 +1077,7 @@
> &cd->ste_tx_chain[i + 1];
> }
>
> - bzero((char *)ld->ste_tx_list,
> - sizeof(struct ste_desc) * STE_TX_LIST_CNT);
> + bzero(ld->ste_tx_list, sizeof(struct ste_desc) * STE_TX_LIST_CNT);
>
> cd->ste_tx_prod = 0;
> cd->ste_tx_cons = 0;
> Index: pci/if_tl.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_tl.c,v
> retrieving revision 1.50
> diff -u -r1.50 if_tl.c
> --- pci/if_tl.c 19 May 2010 15:27:35 -0000 1.50
> +++ pci/if_tl.c 21 Jun 2011 18:04:30 -0000
> @@ -741,7 +741,7 @@
> struct tl_softc *sc = (struct tl_softc *)dev;
> struct tl_mii_frame frame;
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -757,7 +757,7 @@
> struct tl_softc *sc = (struct tl_softc *)dev;
> struct tl_mii_frame frame;
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -1413,7 +1413,7 @@
>
> s = splnet();
>
> - bzero((char *)&tl_stats, sizeof(struct tl_stats));
> + bzero(&tl_stats, sizeof(struct tl_stats));
>
> sc = xsc;
> ifp = &sc->arpcom.ac_if;
> @@ -1911,8 +1911,7 @@
> sc->tl_cdata.tl_rx_chain[i].tl_mbuf = NULL;
> }
> }
> - bzero((char *)&sc->tl_ldata->tl_rx_list,
> - sizeof(sc->tl_ldata->tl_rx_list));
> + bzero(&sc->tl_ldata->tl_rx_list, sizeof(sc->tl_ldata->tl_rx_list));
>
> /*
> * Free the TX list buffers.
> @@ -1923,8 +1922,7 @@
> sc->tl_cdata.tl_tx_chain[i].tl_mbuf = NULL;
> }
> }
> - bzero((char *)&sc->tl_ldata->tl_tx_list,
> - sizeof(sc->tl_ldata->tl_tx_list));
> + bzero(&sc->tl_ldata->tl_tx_list, sizeof(sc->tl_ldata->tl_tx_list));
>
> ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
>
> Index: pci/if_vge.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_vge.c,v
> retrieving revision 1.50
> diff -u -r1.50 if_vge.c
> --- pci/if_vge.c 5 Apr 2011 18:01:21 -0000 1.50
> +++ pci/if_vge.c 21 Jun 2011 18:05:11 -0000
> @@ -771,7 +771,7 @@
> */
> vge_read_eeprom(sc, eaddr, VGE_EE_EADDR, 3, 1);
>
> - bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
> + bcopy(eaddr, &sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
>
> printf(", address %s\n",
> ether_sprintf(sc->arpcom.ac_enaddr));
> @@ -937,8 +937,8 @@
> int
> vge_tx_list_init(struct vge_softc *sc)
> {
> - bzero ((char *)sc->vge_ldata.vge_tx_list, VGE_TX_LIST_SZ);
> - bzero ((char *)&sc->vge_ldata.vge_tx_mbuf,
> + bzero(sc->vge_ldata.vge_tx_list, VGE_TX_LIST_SZ);
> + bzero(&sc->vge_ldata.vge_tx_mbuf,
> (VGE_TX_DESC_CNT * sizeof(struct mbuf *)));
>
> bus_dmamap_sync(sc->sc_dmat,
> @@ -959,8 +959,8 @@
> {
> int i;
>
> - bzero ((char *)sc->vge_ldata.vge_rx_list, VGE_RX_LIST_SZ);
> - bzero ((char *)&sc->vge_ldata.vge_rx_mbuf,
> + bzero(sc->vge_ldata.vge_rx_list, VGE_RX_LIST_SZ);
> + bzero(&sc->vge_ldata.vge_rx_mbuf,
> (VGE_RX_DESC_CNT * sizeof(struct mbuf *)));
>
> sc->vge_rx_consumed = 0;
> @@ -1123,8 +1123,7 @@
> (total_len - ETHER_CRC_LEN);
>
> #ifdef __STRICT_ALIGNMENT
> - bcopy(m->m_data, m->m_data + ETHER_ALIGN,
> - total_len);
> + bcopy(m->m_data, m->m_data + ETHER_ALIGN, total_len);
> m->m_data += ETHER_ALIGN;
> #endif
> ifp->if_ipackets++;
> Index: pci/if_vr.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_vr.c,v
> retrieving revision 1.110
> diff -u -r1.110 if_vr.c
> --- pci/if_vr.c 20 Apr 2011 01:05:28 -0000 1.110
> +++ pci/if_vr.c 21 Jun 2011 18:05:31 -0000
> @@ -281,7 +281,7 @@
> break;
> }
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -305,7 +305,7 @@
> break;
> }
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -1509,8 +1509,7 @@
> sc->vr_cdata.vr_rx_chain[i].vr_map = NULL;
> }
> }
> - bzero((char *)&sc->vr_ldata->vr_rx_list,
> - sizeof(sc->vr_ldata->vr_rx_list));
> + bzero(&sc->vr_ldata->vr_rx_list, sizeof(sc->vr_ldata->vr_rx_list));
>
> /*
> * Free the TX list buffers.
> @@ -1529,8 +1528,7 @@
> sc->vr_cdata.vr_tx_chain[i].vr_map = NULL;
> }
> }
> - bzero((char *)&sc->vr_ldata->vr_tx_list,
> - sizeof(sc->vr_ldata->vr_tx_list));
> + bzero(&sc->vr_ldata->vr_tx_list, sizeof(sc->vr_ldata->vr_tx_list));
> }
>
> #ifndef SMALL_KERNEL
> Index: pci/if_vte.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_vte.c,v
> retrieving revision 1.5
> diff -u -r1.5 if_vte.c
> --- pci/if_vte.c 28 May 2011 08:31:51 -0000 1.5
> +++ pci/if_vte.c 21 Jun 2011 18:05:50 -0000
> @@ -632,7 +632,7 @@
>
> if (padlen > 0) {
> /* Zero out the bytes in the pad area. */
> - bzero(mtod(m, char *) + m->m_pkthdr.len, padlen);
> + bzero(mtod(m, void *) + m->m_pkthdr.len, padlen);
> m->m_pkthdr.len += padlen;
> m->m_len = m->m_pkthdr.len;
> }
> Index: pci/if_wb.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/pci/if_wb.c,v
> retrieving revision 1.47
> diff -u -r1.47 if_wb.c
> --- pci/if_wb.c 3 Apr 2011 15:36:03 -0000 1.47
> +++ pci/if_wb.c 21 Jun 2011 18:06:08 -0000
> @@ -482,7 +482,7 @@
> struct wb_softc *sc = (struct wb_softc *)dev;
> struct wb_mii_frame frame;
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -499,7 +499,7 @@
> struct wb_softc *sc = (struct wb_softc *)dev;
> struct wb_mii_frame frame;
>
> - bzero((char *)&frame, sizeof(frame));
> + bzero(&frame, sizeof(frame));
>
> frame.mii_phyaddr = phy;
> frame.mii_regaddr = reg;
> @@ -1668,8 +1668,7 @@
> /*
> * Free data in the RX lists.
> */
> - bzero((char *)&sc->wb_ldata->wb_rx_list,
> - sizeof(sc->wb_ldata->wb_rx_list));
> + bzero(&sc->wb_ldata->wb_rx_list, sizeof(sc->wb_ldata->wb_rx_list));
>
> /*
> * Free the TX list buffers.
> @@ -1681,8 +1680,7 @@
> }
> }
>
> - bzero((char *)&sc->wb_ldata->wb_tx_list,
> - sizeof(sc->wb_ldata->wb_tx_list));
> + bzero(&sc->wb_ldata->wb_tx_list, sizeof(sc->wb_ldata->wb_tx_list));
> }
>
> struct cfattach wb_ca = {
> Index: usb/if_wi_usb.c
> ===================================================================
> RCS file: /home/tedu/cvs/src/sys/dev/usb/if_wi_usb.c,v
> retrieving revision 1.51
> diff -u -r1.51 if_wi_usb.c
> --- usb/if_wi_usb.c 17 Jun 2011 07:06:47 -0000 1.51
> +++ usb/if_wi_usb.c 21 Jun 2011 18:07:05 -0000
> @@ -913,8 +913,7 @@
> prid->frmlen = htole16(ltv->wi_len);
> prid->rid = htole16(ltv->wi_type);
> if (ltv->wi_len > 1)
> - bcopy((u_int8_t *)<v->wi_val, (u_int8_t *)&prid->data[0],
> - (ltv->wi_len-1)*2);
> + bcopy(<v->wi_val, &prid->data[0], (ltv->wi_len-1)*2);
>
> bzero(((char*)prid)+total_len, rnd_len - total_len);
>
> @@ -1593,7 +1592,7 @@
> frmlen));
>
> if (ltv->wi_len > 1)
> - bcopy(&presp->data[0], (u_int8_t *)<v->wi_val,
> + bcopy(&presp->data[0], <v->wi_val,
> (ltv->wi_len-1)*2);
>
> sc->ridresperr = 0;
