From eaa63fc91ee62fe272caad5474e83239cedee5b1 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 24 May 2012 20:16:10 +0200 Subject: [PATCH] kernel: Remove some bogus casts to the own type (FINAL). --- sys/bus/firewire/fwcrom.c | 2 +- sys/bus/iicbus/iicbus.c | 4 ++-- sys/bus/usb/ehci.c | 3 +-- sys/bus/usb/uhci.c | 2 +- sys/dev/acpica5/Osd/OsdHardware.c | 3 +-- sys/dev/acpica5/Osd/OsdSchedule.c | 4 ++-- sys/dev/acpica5/acdragonfly.h | 3 +-- sys/dev/acpica5/acpi.c | 4 ++-- sys/dev/acpica5/acpi_hpet.c | 2 +- sys/dev/acpica5/acpi_wmi/acpi_wmi.c | 2 +- sys/dev/drm/drm_drawable.c | 3 +-- sys/dev/sound/pci/envy24.c | 2 +- sys/dev/sound/pci/envy24ht.c | 2 +- sys/emulation/ndis/subr_ntoskrnl.c | 2 +- sys/emulation/ndis/subr_usbd.c | 12 ++++++------ sys/gnu/vfs/ext2fs/ext2_balloc.c | 2 +- sys/gnu/vfs/ext2fs/ext2_readwrite.c | 3 +-- sys/gnu/vfs/ext2fs/ext2_vnops.c | 2 +- sys/net/sppp/if_spppsubr.c | 6 +++--- sys/netgraph/pppoe/ng_pppoe.c | 2 +- sys/netgraph7/ppp/ng_ppp.c | 3 +-- sys/netgraph7/pppoe/ng_pppoe.c | 3 +-- sys/netinet/sctp_output.c | 10 +++++----- sys/netinet/sctputil.c | 12 ++++++------ sys/netinet6/ah_core.c | 11 +++++------ sys/netinet6/icmp6.c | 2 +- sys/netinet6/in6_gif.c | 3 +-- sys/netinet6/in6_proto.c | 2 +- sys/netinet6/nd6_nbr.c | 11 +++++------ sys/netinet6/sctp6_usrreq.c | 2 +- sys/netinet6/udp6_output.c | 2 +- sys/netproto/atm/spans/spans_subr.c | 3 +-- sys/netproto/ipsec/keysock.c | 3 +-- sys/netproto/ipsec/xform_ipcomp.c | 2 +- sys/netproto/ipsec/xform_ipip.c | 4 ++-- sys/netproto/key/keysock.c | 3 +-- sys/netproto/ncp/ncp_sock.c | 7 +++---- sys/opencrypto/gmac.c | 5 ++--- sys/opencrypto/xform.c | 18 ++++++------------ 39 files changed, 75 insertions(+), 96 deletions(-) diff --git a/sys/bus/firewire/fwcrom.c b/sys/bus/firewire/fwcrom.c index 7baf17e742..e8c5941178 100644 --- a/sys/bus/firewire/fwcrom.c +++ b/sys/bus/firewire/fwcrom.c @@ -419,7 +419,7 @@ crom_add_entry(struct crom_chunk *chunk, int key, int val) reg = (struct csrreg *)(void *)&i; reg->key = key; reg->val = val; - return(crom_add_quad(chunk, (u_int32_t) i)); + return(crom_add_quad(chunk, i)); } int diff --git a/sys/bus/iicbus/iicbus.c b/sys/bus/iicbus/iicbus.c index aeb865a180..33b16de8ad 100644 --- a/sys/bus/iicbus/iicbus.c +++ b/sys/bus/iicbus/iicbus.c @@ -97,13 +97,13 @@ iic_probe_device(device_t dev, u_char addr) if ((addr & 1) == 0) { /* is device writable? */ - if (!iicbus_start(dev, (u_char)addr, 0)) { + if (!iicbus_start(dev, addr, 0)) { iicbus_stop(dev); return (1); } } else { /* is device readable? */ - if (!iicbus_block_read(dev, (u_char)addr, &byte, 1, &count)) + if (!iicbus_block_read(dev, addr, &byte, 1, &count)) return (1); } diff --git a/sys/bus/usb/ehci.c b/sys/bus/usb/ehci.c index d8cbb16003..f84432d312 100644 --- a/sys/bus/usb/ehci.c +++ b/sys/bus/usb/ehci.c @@ -1,6 +1,5 @@ /* $NetBSD: ehci.c,v 1.91 2005/02/27 00:27:51 perry Exp $ */ /* $FreeBSD: src/sys/dev/usb/ehci.c,v 1.36.2.3 2006/09/24 13:39:04 iedowse Exp $ */ -/* $DragonFly: src/sys/bus/usb/ehci.c,v 1.36 2008/08/14 20:55:53 hasso Exp $ */ /* * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -773,7 +772,7 @@ ehci_idone(struct ehci_xfer *ex) #ifdef EHCI_DEBUG char sbuf[128]; - bitmask_snprintf((u_int32_t)status, + bitmask_snprintf(status, "\20\7HALTED\6BUFERR\5BABBLE\4XACTERR" "\3MISSED\2SPLIT\1PING", sbuf, sizeof(sbuf)); diff --git a/sys/bus/usb/uhci.c b/sys/bus/usb/uhci.c index 08814fd87c..105b47d252 100644 --- a/sys/bus/usb/uhci.c +++ b/sys/bus/usb/uhci.c @@ -1396,7 +1396,7 @@ uhci_idone(uhci_intr_info_t *ii) #ifdef USB_DEBUG char sbuf[128]; - bitmask_snprintf((u_int32_t)status, + bitmask_snprintf(status, "\20\22BITSTUFF\23CRCTO\24NAK\25" "BABBLE\26DBUFFER\27STALLED\30ACTIVE", sbuf, sizeof(sbuf)); diff --git a/sys/dev/acpica5/Osd/OsdHardware.c b/sys/dev/acpica5/Osd/OsdHardware.c index f96e07c6ac..938a854c21 100644 --- a/sys/dev/acpica5/Osd/OsdHardware.c +++ b/sys/dev/acpica5/Osd/OsdHardware.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.13 2004/04/14 03:39:08 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdHardware.c,v 1.5 2008/08/02 01:14:42 dillon Exp $ */ /* @@ -119,7 +118,7 @@ AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 Register, UINT64 *Value, if (!pci_cfgregopen()) return (AE_NOT_EXIST); - *(UINT64 *)Value = pci_cfgregread(PciId->Bus, PciId->Device, + *Value = pci_cfgregread(PciId->Bus, PciId->Device, PciId->Function, Register, bytes); *Value &= (1 << (bytes * 8)) - 1; diff --git a/sys/dev/acpica5/Osd/OsdSchedule.c b/sys/dev/acpica5/Osd/OsdSchedule.c index 087e68933e..99523dabc0 100644 --- a/sys/dev/acpica5/Osd/OsdSchedule.c +++ b/sys/dev/acpica5/Osd/OsdSchedule.c @@ -98,8 +98,8 @@ acpi_task_thread(void *arg) get_mplock(); for (;;) { at = (void *)lwkt_waitport(&curthread->td_msgport, 0); - func = (ACPI_OSD_EXEC_CALLBACK)at->at_function; - func((void *)at->at_context); + func = at->at_function; + func(at->at_context); lwkt_replymsg(&at->at_msg, 0); } rel_mplock(); diff --git a/sys/dev/acpica5/acdragonfly.h b/sys/dev/acpica5/acdragonfly.h index 5d28ae8858..179faa1e6c 100644 --- a/sys/dev/acpica5/acdragonfly.h +++ b/sys/dev/acpica5/acdragonfly.h @@ -2,7 +2,6 @@ * * Name: acfreebsd.h - OS specific defines, etc. * $Revision: 11 $ - * $DragonFly: src/sys/dev/acpica5/acdragonfly.h,v 1.3 2007/01/17 17:31:19 y0netan1 Exp $ * *****************************************************************************/ @@ -212,7 +211,7 @@ strstr(char *s, char *find) } while (strncmp(s, find, len) != 0); s--; } - return ((char *)s); + return (s); } #endif /* _KERNEL */ diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica5/acpi.c index 241e1a123f..3cc9488ade 100644 --- a/sys/dev/acpica5/acpi.c +++ b/sys/dev/acpica5/acpi.c @@ -894,7 +894,7 @@ acpi_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) *(ACPI_HANDLE *)result = ad->ad_handle; break; case ACPI_IVAR_MAGIC: - *(uintptr_t *)result = ad->ad_magic; + *result = ad->ad_magic; break; case ACPI_IVAR_PRIVATE: *(void **)result = ad->ad_private; @@ -932,7 +932,7 @@ acpi_write_ivar(device_t dev, device_t child, int index, uintptr_t value) ad->ad_handle = (ACPI_HANDLE)value; break; case ACPI_IVAR_MAGIC: - ad->ad_magic = (uintptr_t)value; + ad->ad_magic = value; break; case ACPI_IVAR_PRIVATE: ad->ad_private = (void *)value; diff --git a/sys/dev/acpica5/acpi_hpet.c b/sys/dev/acpica5/acpi_hpet.c index d712351c52..035e6ef49f 100644 --- a/sys/dev/acpica5/acpi_hpet.c +++ b/sys/dev/acpica5/acpi_hpet.c @@ -138,7 +138,7 @@ acpi_hpet_identify(driver_t *driver, device_t parent) /* Currently, ID and minimum clock tick info is unused. */ - status = AcpiGetTable(ACPI_SIG_HPET, 1, (ACPI_TABLE_HEADER **)&hdr); + status = AcpiGetTable(ACPI_SIG_HPET, 1, &hdr); if (ACPI_FAILURE(status)) return ENXIO; diff --git a/sys/dev/acpica5/acpi_wmi/acpi_wmi.c b/sys/dev/acpica5/acpi_wmi/acpi_wmi.c index 9a2ed70fe9..315ed285c1 100644 --- a/sys/dev/acpica5/acpi_wmi/acpi_wmi.c +++ b/sys/dev/acpica5/acpi_wmi/acpi_wmi.c @@ -679,7 +679,7 @@ acpi_wmi_ec_handler(UINT32 function, ACPI_PHYSICAL_ADDRESS address, case ACPI_READ: status = ACPI_EC_READ(sc->ec_dev, ec_addr, &ec_data, 1); if (ACPI_SUCCESS(status)) - *value |= ((UINT64)ec_data) << i; + *value |= ec_data << i; break; case ACPI_WRITE: ec_data = (UINT8)((*value) >> i); diff --git a/sys/dev/drm/drm_drawable.c b/sys/dev/drm/drm_drawable.c index 004e897328..3ddd709fe5 100644 --- a/sys/dev/drm/drm_drawable.c +++ b/sys/dev/drm/drm_drawable.c @@ -163,8 +163,7 @@ void drm_drawable_free_all(struct drm_device *dev) for (info = RB_MIN(drawable_tree, &dev->drw_head); info != NULL ; info = next) { next = RB_NEXT(drawable_tree, &dev->drw_head, info); - RB_REMOVE(drawable_tree, &dev->drw_head, - (struct bsd_drm_drawable_info *)info); + RB_REMOVE(drawable_tree, &dev->drw_head, info); DRM_SPINUNLOCK(&dev->drw_lock); free(info->info.rects, DRM_MEM_DRAWABLE); free(info, DRM_MEM_DRAWABLE); diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 1dc9673fc9..4298364702 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -1430,7 +1430,7 @@ envy24_p8u(struct sc_chinfo *ch) length = sndbuf_getready(ch->buffer) / 2; dmabuf = ch->parent->pbuf; - data = (u_int8_t *)ch->data; + data = ch->data; src = sndbuf_getreadyptr(ch->buffer); dst = src / 2 + ch->offset; ssize = ch->size; diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index 7d499f308f..5a300b1d5a 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -1369,7 +1369,7 @@ envy24ht_p8u(struct sc_chinfo *ch) length = sndbuf_getready(ch->buffer) / 2; dmabuf = ch->parent->pbuf; - data = (u_int8_t *)ch->data; + data = ch->data; src = sndbuf_getreadyptr(ch->buffer); dst = src / 2 + ch->offset; ssize = ch->size; diff --git a/sys/emulation/ndis/subr_ntoskrnl.c b/sys/emulation/ndis/subr_ntoskrnl.c index fd6598eb85..17298834ca 100644 --- a/sys/emulation/ndis/subr_ntoskrnl.c +++ b/sys/emulation/ndis/subr_ntoskrnl.c @@ -486,7 +486,7 @@ ntoskrnl_strstr(char *s, char *find) } while (strncmp(s, find, len) != 0); s--; } - return ((char *)s); + return (s); } /* Taken from libc */ diff --git a/sys/emulation/ndis/subr_usbd.c b/sys/emulation/ndis/subr_usbd.c index 45c309572e..bf1c8b784f 100644 --- a/sys/emulation/ndis/subr_usbd.c +++ b/sys/emulation/ndis/subr_usbd.c @@ -137,17 +137,17 @@ usbd_libinit(void) } windrv_wrap((funcptr)usbd_ioinvalid, - (funcptr *)&usbd_ioinvalid_wrap, 2, WINDRV_WRAP_STDCALL); + &usbd_ioinvalid_wrap, 2, WINDRV_WRAP_STDCALL); windrv_wrap((funcptr)usbd_iodispatch, - (funcptr *)&usbd_iodispatch_wrap, 2, WINDRV_WRAP_STDCALL); + &usbd_iodispatch_wrap, 2, WINDRV_WRAP_STDCALL); windrv_wrap((funcptr)usbd_pnp, - (funcptr *)&usbd_pnp_wrap, 2, WINDRV_WRAP_STDCALL); + &usbd_pnp_wrap, 2, WINDRV_WRAP_STDCALL); windrv_wrap((funcptr)usbd_power, - (funcptr *)&usbd_power_wrap, 2, WINDRV_WRAP_STDCALL); + &usbd_power_wrap, 2, WINDRV_WRAP_STDCALL); windrv_wrap((funcptr)usbd_irpcancel, - (funcptr *)&usbd_irpcancel_wrap, 2, WINDRV_WRAP_STDCALL); + &usbd_irpcancel_wrap, 2, WINDRV_WRAP_STDCALL); windrv_wrap((funcptr)usbd_xfertask, - (funcptr *)&usbd_xfertask_wrap, 2, WINDRV_WRAP_STDCALL); + &usbd_xfertask_wrap, 2, WINDRV_WRAP_STDCALL); /* Create a fake USB driver instance. */ diff --git a/sys/gnu/vfs/ext2fs/ext2_balloc.c b/sys/gnu/vfs/ext2fs/ext2_balloc.c index 81b1d4b9a4..acb371c367 100644 --- a/sys/gnu/vfs/ext2fs/ext2_balloc.c +++ b/sys/gnu/vfs/ext2fs/ext2_balloc.c @@ -125,7 +125,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n", } else { /* Godmar thinks: this shouldn't happen w/o fragments */ kprintf("nsize %d(%d) > osize %d(%d) nb %d\n", - (int)nsize, (int)size, (int)osize, + nsize, size, osize, (int)ip->i_size, (int)nb); panic( "ext2_balloc: Something is terribly wrong"); diff --git a/sys/gnu/vfs/ext2fs/ext2_readwrite.c b/sys/gnu/vfs/ext2fs/ext2_readwrite.c index eab450bbec..c0e6c9f610 100644 --- a/sys/gnu/vfs/ext2fs/ext2_readwrite.c +++ b/sys/gnu/vfs/ext2fs/ext2_readwrite.c @@ -256,8 +256,7 @@ ext2_write(struct vop_write_args *ap) if (size < xfersize) xfersize = size; - error = uiomove((char *)bp->b_data + blkoffset, - (int)xfersize, uio); + error = uiomove((char *)bp->b_data + blkoffset, xfersize, uio); if ((ioflag & IO_VMIO) && LIST_FIRST(&bp->b_dep) == NULL) /* in ext2fs? */ bp->b_flags |= B_RELBUF; diff --git a/sys/gnu/vfs/ext2fs/ext2_vnops.c b/sys/gnu/vfs/ext2fs/ext2_vnops.c index b5167be087..c22bdefaa9 100644 --- a/sys/gnu/vfs/ext2fs/ext2_vnops.c +++ b/sys/gnu/vfs/ext2fs/ext2_vnops.c @@ -1553,7 +1553,7 @@ ext2_chown(struct vnode *vp, uid_t uid, gid_t gid, struct ucred *cred) */ if ((cred->cr_uid != ip->i_uid || uid != ip->i_uid || (gid != ip->i_gid && !(cred->cr_gid == gid || - groupmember((gid_t)gid, cred)))) && + groupmember(gid, cred)))) && (error = priv_check_cred(cred, PRIV_VFS_CHOWN, 0))) return (error); ogid = ip->i_gid; diff --git a/sys/net/sppp/if_spppsubr.c b/sys/net/sppp/if_spppsubr.c index 676e91235e..8af93ddc6e 100644 --- a/sys/net/sppp/if_spppsubr.c +++ b/sys/net/sppp/if_spppsubr.c @@ -1276,7 +1276,7 @@ sppp_cisco_input(struct sppp *sp, struct mbuf *m) SPP_FMT "cisco input: %d bytes " "<0x%lx 0x%lx 0x%lx 0x%x 0x%x-0x%x>\n", SPP_ARGS(ifp), m->m_pkthdr.len, - (u_long)ntohl (h->type), (u_long)h->par1, (u_long)h->par2, (u_int)h->rel, + (u_long)ntohl (h->type), h->par1, h->par2, (u_int)h->rel, (u_int)h->time0, (u_int)h->time1); switch (ntohl (h->type)) { default: @@ -1375,8 +1375,8 @@ sppp_cisco_send(struct sppp *sp, int type, long par1, long par2) if (debug) log(LOG_DEBUG, SPP_FMT "cisco output: <0x%lx 0x%lx 0x%lx 0x%x 0x%x-0x%x>\n", - SPP_ARGS(ifp), (u_long)ntohl (ch->type), (u_long)ch->par1, - (u_long)ch->par2, (u_int)ch->rel, (u_int)ch->time0, (u_int)ch->time1); + SPP_ARGS(ifp), (u_long)ntohl (ch->type), ch->par1, + ch->par2, (u_int)ch->rel, (u_int)ch->time0, (u_int)ch->time1); if (IF_QFULL (&sp->pp_cpq)) { IF_DROP (&sp->pp_fastq); diff --git a/sys/netgraph/pppoe/ng_pppoe.c b/sys/netgraph/pppoe/ng_pppoe.c index fd2d664f91..0b8d64439e 100644 --- a/sys/netgraph/pppoe/ng_pppoe.c +++ b/sys/netgraph/pppoe/ng_pppoe.c @@ -370,7 +370,7 @@ AAA sp->neg->numtags = count; break; /* XXX chop off what's too long */ } - bcopy(*tag, (char *)dp, tlen); + bcopy(*tag, dp, tlen); length += tlen; dp += tlen; } diff --git a/sys/netgraph7/ppp/ng_ppp.c b/sys/netgraph7/ppp/ng_ppp.c index 267a9fb008..ee3de82efc 100644 --- a/sys/netgraph7/ppp/ng_ppp.c +++ b/sys/netgraph7/ppp/ng_ppp.c @@ -59,7 +59,6 @@ * Authors: Archie Cobbs , Alexander Motin * * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.75 2008/02/06 20:37:34 mav Exp $ - * $DragonFly: src/sys/netgraph7/ng_ppp.c,v 1.2 2008/06/26 23:05:35 dillon Exp $ * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $ */ @@ -2396,7 +2395,7 @@ ng_ppp_addproto(struct mbuf *m, uint16_t proto, int compOK) return ng_ppp_prepend(m, &pbyte, 1); } else { - uint16_t pword = htons((uint16_t)proto); + uint16_t pword = htons(proto); return ng_ppp_prepend(m, &pword, 2); } diff --git a/sys/netgraph7/pppoe/ng_pppoe.c b/sys/netgraph7/pppoe/ng_pppoe.c index d028036fbc..08057c6268 100644 --- a/sys/netgraph7/pppoe/ng_pppoe.c +++ b/sys/netgraph7/pppoe/ng_pppoe.c @@ -38,7 +38,6 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.94 2008/03/03 19:36:03 mav Exp $ - * $DragonFly: src/sys/netgraph7/ng_pppoe.c,v 1.2 2008/06/26 23:05:35 dillon Exp $ * $Whistle: ng_pppoe.c,v 1.10 1999/11/01 09:24:52 julian Exp $ */ @@ -392,7 +391,7 @@ make_packet(sessp sp) { sp->neg->numtags = count; break; /* XXX chop off what's too long */ } - bcopy(*tag, (char *)dp, tlen); + bcopy(*tag, dp, tlen); length += tlen; dp += tlen; } diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index a89130d9de..b8beb35510 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -334,8 +334,7 @@ sctp_add_cookie(struct sctp_inpcb *inp, struct mbuf *init, int init_offset, /* Time to sign the cookie */ sctp_hash_digest_m((char *)inp->sctp_ep.secret_key[ (int)(inp->sctp_ep.current_secret_number)], - SCTP_SECRET_SIZE, mret, sizeof(struct sctp_paramhdr), - (uint8_t *)signature); + SCTP_SECRET_SIZE, mret, sizeof(struct sctp_paramhdr), signature); sig->m_len += SCTP_SIGNATURE_SIZE; cookie_sz += SCTP_SIGNATURE_SIZE; @@ -2617,7 +2616,8 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp, else { #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) { - kprintf("Unknown protocol (TSNH) type %d\n", ((struct sockaddr *)to)->sa_family); + kprintf("Unknown protocol (TSNH) type %d\n", + to->sa_family); } #endif sctp_m_freem(m); @@ -5480,7 +5480,7 @@ sctp_med_chunk_output(struct sctp_inpcb *inp, #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_OUTPUT3) { kprintf("Ok we have done the fillup no_data_chunk=%d tf=%d prw:%d\n", - (int)no_data_chunks, + no_data_chunks, (int)asoc->total_flight, (int)asoc->peers_rwnd); } #endif @@ -9722,7 +9722,7 @@ sctp_copy_it_in(struct sctp_inpcb *inp, ph++; mm->m_pkthdr.len = tot_out + sizeof(struct sctp_paramhdr); mm->m_len = mm->m_pkthdr.len; - error = uiomove((caddr_t)ph, (int)tot_out, uio); + error = uiomove((caddr_t)ph, tot_out, uio); if (error) { /* * Here if we can't get his data we diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 00f6d52536..af89207948 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -2256,7 +2256,7 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, m_notify->m_len = sizeof(struct sctp_paddr_change); m_notify->m_next = NULL; - to = (struct sockaddr *)(struct sockaddr *) + to = (struct sockaddr *) &stcb->asoc.primary_destination->ro._l_addr; if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_NEEDS_MAPPED_V4) && to->sa_family == AF_INET) { @@ -2360,7 +2360,7 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, u_int32_t error, /* Steal off the mbuf */ chk->data = NULL; - to = (struct sockaddr *)(struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; + to = (struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_NEEDS_MAPPED_V4) && to->sa_family == AF_INET) { struct sockaddr_in *sin; @@ -2441,7 +2441,7 @@ sctp_notify_adaption_layer(struct sctp_tcb *stcb, m_notify->m_len = sizeof(struct sctp_adaption_event); m_notify->m_next = NULL; - to = (struct sockaddr *)(struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; + to = (struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_NEEDS_MAPPED_V4) && (to->sa_family == AF_INET)) { struct sockaddr_in *sin; @@ -2520,7 +2520,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, m_notify->m_len = sizeof(struct sctp_pdapi_event); m_notify->m_next = NULL; - to = (struct sockaddr *)(struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; + to = (struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_NEEDS_MAPPED_V4) && (to->sa_family == AF_INET)) { struct sockaddr_in *sin; @@ -2608,7 +2608,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb) m_notify->m_len = sizeof(struct sctp_shutdown_event); m_notify->m_next = NULL; - to = (struct sockaddr *)(struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; + to = (struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_NEEDS_MAPPED_V4) && to->sa_family == AF_INET) { struct sockaddr_in *sin; @@ -2713,7 +2713,7 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, sctp_m_freem(m_notify); return; } - to = (struct sockaddr *)(struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; + to = (struct sockaddr *)&stcb->asoc.primary_destination->ro._l_addr; if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_NEEDS_MAPPED_V4) && to->sa_family == AF_INET) { struct sockaddr_in *sin; diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c index 8d0f11b359..2121ef36e4 100644 --- a/sys/netinet6/ah_core.c +++ b/sys/netinet6/ah_core.c @@ -1,5 +1,4 @@ /* $FreeBSD: src/sys/netinet6/ah_core.c,v 1.2.2.5 2002/04/28 05:40:26 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/ah_core.c,v 1.11 2008/01/05 14:02:40 swildner Exp $ */ /* $KAME: ah_core.c,v 1.44 2001/03/12 11:24:39 itojun Exp $ */ /* @@ -428,7 +427,7 @@ ah_keyed_sha1_loop(struct ah_algorithm_state *state, caddr_t addr, size_t len) panic("ah_keyed_sha1_loop: what?"); ctxt = (SHA1_CTX *)state->foo; - SHA1Update(ctxt, (caddr_t)addr, (size_t)len); + SHA1Update(ctxt, addr, len); } static void @@ -655,7 +654,7 @@ ah_hmac_sha1_loop(struct ah_algorithm_state *state, caddr_t addr, size_t len) panic("ah_hmac_sha1_loop: what?"); ctxt = (SHA1_CTX *)(((u_char *)state->foo) + 128); - SHA1Update(ctxt, (caddr_t)addr, (size_t)len); + SHA1Update(ctxt, addr, len); } static void @@ -779,7 +778,7 @@ ah_hmac_sha2_256_loop(struct ah_algorithm_state *state, caddr_t addr, size_t panic("ah_hmac_sha2_256_loop: what?"); ctxt = (SHA256_CTX *)(((u_char *)state->foo) + 128); - SHA256_Update(ctxt, (caddr_t)addr, (size_t)len); + SHA256_Update(ctxt, addr, len); } static void @@ -904,7 +903,7 @@ ah_hmac_sha2_384_loop(struct ah_algorithm_state *state, caddr_t addr, panic("ah_hmac_sha2_384_loop: what?"); ctxt = (SHA384_CTX *)(((u_char *)state->foo) + 128); - SHA384_Update(ctxt, (caddr_t)addr, (size_t)len); + SHA384_Update(ctxt, addr, len); } static void @@ -1029,7 +1028,7 @@ ah_hmac_sha2_512_loop(struct ah_algorithm_state *state, caddr_t addr, panic("ah_hmac_sha2_512_loop: what?"); ctxt = (SHA512_CTX *)(((u_char *)state->foo) + 128); - SHA512_Update(ctxt, (caddr_t)addr, (size_t)len); + SHA512_Update(ctxt, addr, len); } static void diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index f1eb80ac7d..decc8a0913 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1053,7 +1053,7 @@ icmp6_notify_error(struct mbuf *m, int off, int icmp6len, int code) } so_pru_ctlinput( - (struct protosw *)&inet6sw[ip6_protox[nxt]], + &inet6sw[ip6_protox[nxt]], code, (struct sockaddr *)&icmp6dst, &ip6cp); } return (0); diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index 239d7f410b..d0276867f5 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -1,5 +1,4 @@ /* $FreeBSD: src/sys/netinet6/in6_gif.c,v 1.2.2.7 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/in6_gif.c,v 1.18 2008/10/27 02:56:30 sephe Exp $ */ /* $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $ */ /* @@ -377,7 +376,7 @@ int in6_gif_attach(struct gif_softc *sc) { sc->encap_cookie6 = encap_attach_func(AF_INET6, -1, gif_encapcheck, - (struct protosw *)&in6_gif_protosw, sc); + &in6_gif_protosw, sc); if (sc->encap_cookie6 == NULL) return EEXIST; return 0; diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 1a64ca2491..9a26636969 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -396,7 +396,7 @@ extern int in6_inithead (void **, int); struct domain inet6domain = { AF_INET6, "internet6", NULL, NULL, NULL, (struct protosw *)inet6sw, - (struct protosw *)&inet6sw[NELEM(inet6sw)], + &inet6sw[NELEM(inet6sw)], SLIST_ENTRY_INITIALIZER, in6_inithead, offsetof(struct sockaddr_in6, sin6_addr) << 3, sizeof(struct sockaddr_in6), in6_domifattach, in6_domifdetach diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 33ef955085..3e652d62b3 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,5 +1,4 @@ /* $FreeBSD: src/sys/netinet6/nd6_nbr.c,v 1.4.2.6 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/nd6_nbr.c,v 1.24 2008/10/03 07:59:20 hasso Exp $ */ /* $KAME: nd6_nbr.c,v 1.86 2002/01/21 02:33:04 jinmei Exp $ */ /* @@ -1094,7 +1093,7 @@ nd6_dad_start(struct ifaddr *ifa, return; } callout_init(&dp->dad_timer_ch); - TAILQ_INSERT_TAIL(&dadq, (struct dadq *)dp, dad_list); + TAILQ_INSERT_TAIL(&dadq, dp, dad_list); nd6log((LOG_DEBUG, "%s: starting DAD for %s\n", if_name(ifa->ifa_ifp), ip6_sprintf(&ia->ia_addr.sin6_addr))); @@ -1144,7 +1143,7 @@ nd6_dad_stop(struct ifaddr *ifa) nd6_dad_stoptimer(dp); - TAILQ_REMOVE(&dadq, (struct dadq *)dp, dad_list); + TAILQ_REMOVE(&dadq, dp, dad_list); kfree(dp, M_IP6NDP); dp = NULL; _IFAFREE(ifa, 0); @@ -1188,7 +1187,7 @@ nd6_dad_timer(struct ifaddr *ifa) nd6log((LOG_INFO, "%s: could not run DAD, driver problem?\n", if_name(ifa->ifa_ifp))); - TAILQ_REMOVE(&dadq, (struct dadq *)dp, dad_list); + TAILQ_REMOVE(&dadq, dp, dad_list); kfree(dp, M_IP6NDP); dp = NULL; _IFAFREE(ifa, 0); @@ -1266,7 +1265,7 @@ nd6_dad_timer(struct ifaddr *ifa) if_name(ifa->ifa_ifp), ip6_sprintf(&ia->ia_addr.sin6_addr))); - TAILQ_REMOVE(&dadq, (struct dadq *)dp, dad_list); + TAILQ_REMOVE(&dadq, dp, dad_list); kfree(dp, M_IP6NDP); dp = NULL; _IFAFREE(ifa, 0); @@ -1305,7 +1304,7 @@ nd6_dad_duplicated(struct ifaddr *ifa) log(LOG_ERR, "%s: manual intervention required\n", if_name(ifa->ifa_ifp)); - TAILQ_REMOVE(&dadq, (struct dadq *)dp, dad_list); + TAILQ_REMOVE(&dadq, dp, dad_list); kfree(dp, M_IP6NDP); dp = NULL; _IFAFREE(ifa, 0); diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index ac281f13fa..8f27b6f940 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -281,7 +281,7 @@ sctp6_input(struct mbuf **mp, int *offp, int proto) /* in6p's ref-count increased && stcb locked */ if ((in6p) && (stcb)) { sctp_send_packet_dropped(stcb, net, m, iphlen, 1); - sctp_chunk_output((struct sctp_inpcb *)in6p, stcb, 2); + sctp_chunk_output(in6p, stcb, 2); } else if ((in6p != NULL) && (stcb == NULL)) { refcount_up = 1; } diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c index 6c3088f5f2..a2e10b01fd 100644 --- a/sys/netinet6/udp6_output.c +++ b/sys/netinet6/udp6_output.c @@ -166,7 +166,7 @@ udp6_output(struct in6pcb *in6p, struct mbuf *m, struct sockaddr *addr6, error = EISCONN; goto release; } - if (!prison_remote_ip(td, (struct sockaddr *)addr6)) { + if (!prison_remote_ip(td, addr6)) { error = EAFNOSUPPORT; /* IPv4 only jail */ goto release; } diff --git a/sys/netproto/atm/spans/spans_subr.c b/sys/netproto/atm/spans/spans_subr.c index 1eb62f4208..d27f339282 100644 --- a/sys/netproto/atm/spans/spans_subr.c +++ b/sys/netproto/atm/spans/spans_subr.c @@ -24,7 +24,6 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_subr.c,v 1.4 1999/08/28 00:48:52 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_subr.c,v 1.6 2006/01/14 13:36:39 swildner Exp $ */ /* @@ -446,7 +445,7 @@ spans_switch_reset(struct spans *spp, int cause) * Close the SVC and notify the owner */ outstate = vcp->vc_sstate; - SPANS_VC_CANCEL((struct vccb *) vcp); + SPANS_VC_CANCEL(vcp); vcp->vc_ustate = VCCU_CLOSED; vcp->vc_sstate = SPANS_VC_FREE; if (outstate == SPANS_VC_OPEN || diff --git a/sys/netproto/ipsec/keysock.c b/sys/netproto/ipsec/keysock.c index c4bc379b6e..b292ec90d6 100644 --- a/sys/netproto/ipsec/keysock.c +++ b/sys/netproto/ipsec/keysock.c @@ -160,8 +160,7 @@ key_sendup0(struct rawcb *rp, struct mbuf *m, int promisc) pfkeystat.in_msgtype[pmsg->sadb_msg_type]++; } - if (!ssb_appendaddr(&rp->rcb_socket->so_rcv, (struct sockaddr *)&key_src, - m, NULL)) { + if (!ssb_appendaddr(&rp->rcb_socket->so_rcv, &key_src, m, NULL)) { pfkeystat.in_nomem++; m_freem(m); error = ENOBUFS; diff --git a/sys/netproto/ipsec/xform_ipcomp.c b/sys/netproto/ipsec/xform_ipcomp.c index df55456e17..6db4276082 100644 --- a/sys/netproto/ipsec/xform_ipcomp.c +++ b/sys/netproto/ipsec/xform_ipcomp.c @@ -320,7 +320,7 @@ ipcomp_input_cb(struct cryptop *crp) } /* Restore the Next Protocol field */ - m_copyback(m, protoff, sizeof (u_int8_t), (u_int8_t *) &nproto); + m_copyback(m, protoff, sizeof (u_int8_t), &nproto); IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff, NULL); diff --git a/sys/netproto/ipsec/xform_ipip.c b/sys/netproto/ipsec/xform_ipip.c index 387f398434..3240dc0bbe 100644 --- a/sys/netproto/ipsec/xform_ipip.c +++ b/sys/netproto/ipsec/xform_ipip.c @@ -677,10 +677,10 @@ ipe4_attach(void) /* attach to encapsulation framework */ /* XXX save return cookie for detach on module remove */ encap_attach_func(AF_INET, -1, - ipe4_encapcheck, (struct protosw*) &ipe4_protosw[0], NULL); + ipe4_encapcheck, &ipe4_protosw[0], NULL); #ifdef INET6 encap_attach_func(AF_INET6, -1, - ipe4_encapcheck, (struct protosw*) &ipe4_protosw[1], NULL); + ipe4_encapcheck, &ipe4_protosw[1], NULL); #endif } SYSINIT(ipe4_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ipe4_attach, NULL); diff --git a/sys/netproto/key/keysock.c b/sys/netproto/key/keysock.c index ce29f08399..c65d9710d6 100644 --- a/sys/netproto/key/keysock.c +++ b/sys/netproto/key/keysock.c @@ -158,8 +158,7 @@ key_sendup0(struct rawcb *rp, struct mbuf *m, int promisc) } lwkt_gettoken(&key_token); - if (!ssb_appendaddr(&rp->rcb_socket->so_rcv, - (struct sockaddr *)&key_src, m, NULL)) { + if (!ssb_appendaddr(&rp->rcb_socket->so_rcv, &key_src, m, NULL)) { pfkeystat.in_nomem++; m_freem(m); error = ENOBUFS; diff --git a/sys/netproto/ncp/ncp_sock.c b/sys/netproto/ncp/ncp_sock.c index ce822018e2..3de9275668 100644 --- a/sys/netproto/ncp/ncp_sock.c +++ b/sys/netproto/ncp/ncp_sock.c @@ -88,7 +88,7 @@ static int ncp_soconnect(struct socket *so,struct sockaddr *target, struct thread *td) { int error; - error = soconnect(so, (struct sockaddr*)target, td); + error = soconnect(so, target, td); if (error) return error; /* @@ -129,7 +129,7 @@ ncp_getsockname(struct socket *so, caddr_t asa, int *alen) { if (error==0) { if (sa) { len = min(len, sa->sa_len); - bcopy(sa, (caddr_t)asa, (u_int)len); + bcopy(sa, asa, (u_int)len); } *alen=len; } @@ -343,8 +343,7 @@ ncp_watchdog(struct ncp_conn *conn) { so = conn->wdg_so; sbinit(&sio, 1000000); flags = MSG_DONTWAIT; - error = so_pru_soreceive(so, (struct sockaddr**)&sa, - NULL, &sio, NULL, &flags); + error = so_pru_soreceive(so, &sa, NULL, &sio, NULL, &flags); if (error) break; len = sio.sb_cc; diff --git a/sys/opencrypto/gmac.c b/sys/opencrypto/gmac.c index f5a9cfe392..67c542bba5 100644 --- a/sys/opencrypto/gmac.c +++ b/sys/opencrypto/gmac.c @@ -132,10 +132,9 @@ AES_GMAC_Update(AES_GMAC_CTX *ctx, uint8_t *data, uint16_t len) if (len > 0) { plen = len % GMAC_BLOCK_LEN; if (len >= GMAC_BLOCK_LEN) - ghash_update(&ctx->ghash, (uint8_t *)data, len - plen); + ghash_update(&ctx->ghash, data, len - plen); if (plen) { - bcopy((uint8_t *)data + (len - plen), (uint8_t *)blk, - plen); + bcopy(data + (len - plen), (uint8_t *)blk, plen); ghash_update(&ctx->ghash, (uint8_t *)blk, GMAC_BLOCK_LEN); } diff --git a/sys/opencrypto/xform.c b/sys/opencrypto/xform.c index 8bc07817af..bcfdf2edfc 100644 --- a/sys/opencrypto/xform.c +++ b/sys/opencrypto/xform.c @@ -935,15 +935,13 @@ cml_zerokey(u_int8_t **sched) static void twofish128_encrypt(caddr_t key, u_int8_t *blk, u_int8_t *iv) { - twofish_encrypt((twofish_ctx *) key, (u_int8_t *) blk, - (u_int8_t *) blk); + twofish_encrypt((twofish_ctx *) key, blk, blk); } static void twofish128_decrypt(caddr_t key, u_int8_t *blk, u_int8_t *iv) { - twofish_decrypt(((twofish_ctx *) key), (u_int8_t *) blk, - (u_int8_t *) blk); + twofish_decrypt(((twofish_ctx *) key), blk, blk); } static int @@ -956,8 +954,7 @@ twofish128_setkey(u_int8_t **sched, u_int8_t *key, int len) *sched = kmalloc(sizeof(twofish_ctx), M_CRYPTO_DATA, M_INTWAIT | M_ZERO); if (*sched != NULL) { - twofish_set_key((twofish_ctx *) *sched, (u_int8_t *) key, - len * 8); + twofish_set_key((twofish_ctx *) *sched, key, len * 8); err = 0; } else err = ENOMEM; @@ -975,15 +972,13 @@ twofish128_zerokey(u_int8_t **sched) static void serpent128_encrypt(caddr_t key, u_int8_t *blk, u_int8_t *iv) { - serpent_encrypt((serpent_ctx *) key, (u_int8_t *) blk, - (u_int8_t *) blk); + serpent_encrypt((serpent_ctx *) key, blk, blk); } static void serpent128_decrypt(caddr_t key, u_int8_t *blk, u_int8_t *iv) { - serpent_decrypt(((serpent_ctx *) key), (u_int8_t *) blk, - (u_int8_t *) blk); + serpent_decrypt(((serpent_ctx *) key), blk, blk); } static int @@ -996,8 +991,7 @@ serpent128_setkey(u_int8_t **sched, u_int8_t *key, int len) *sched = kmalloc(sizeof(serpent_ctx), M_CRYPTO_DATA, M_INTWAIT | M_ZERO); if (*sched != NULL) { - serpent_set_key((serpent_ctx *) *sched, (u_int8_t *) key, - len * 8); + serpent_set_key((serpent_ctx *) *sched, key, len * 8); err = 0; } else err = ENOMEM; -- 2.41.0