From: Julian Seward Date: Mon, 19 Oct 2015 11:21:33 +0000 (+0000) Subject: Fix inconsistent use of vki_ prefixes for struct vki_ifreq. X-Git-Tag: svn/VALGRIND_3_12_0~310 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e5d78dda0f90db2c5e4b49434af582ccb9f933d;p=thirdparty%2Fvalgrind.git Fix inconsistent use of vki_ prefixes for struct vki_ifreq. No functional change. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15713 --- diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c index 163c0da745..f796969898 100644 --- a/coregrind/m_syswrap/syswrap-linux.c +++ b/coregrind/m_syswrap/syswrap-linux.c @@ -5992,8 +5992,8 @@ PRE(sys_ioctl) PRE_MEM_RASCIIZ( "ioctl(SIOCSIFMAP)", (Addr)((struct vki_ifreq *)ARG3)->vki_ifr_name ); PRE_MEM_READ( "ioctl(SIOCSIFMAP)", - (Addr)&((struct vki_ifreq *)ARG3)->ifr_map, - sizeof(((struct vki_ifreq *)ARG3)->ifr_map) ); + (Addr)&((struct vki_ifreq *)ARG3)->vki_ifr_map, + sizeof(((struct vki_ifreq *)ARG3)->vki_ifr_map) ); break; case VKI_SIOCSHWTSTAMP: /* Set hardware time stamping */ PRE_MEM_RASCIIZ( "ioctl(SIOCSHWTSTAMP)", @@ -6006,8 +6006,8 @@ PRE(sys_ioctl) PRE_MEM_RASCIIZ( "ioctl(SIOCSIFTXQLEN)", (Addr)((struct vki_ifreq *)ARG3)->vki_ifr_name ); PRE_MEM_READ( "ioctl(SIOCSIFTXQLEN)", - (Addr)&((struct vki_ifreq *)ARG3)->ifr_qlen, - sizeof(((struct vki_ifreq *)ARG3)->ifr_qlen) ); + (Addr)&((struct vki_ifreq *)ARG3)->vki_ifr_qlen, + sizeof(((struct vki_ifreq *)ARG3)->vki_ifr_qlen) ); break; case VKI_SIOCSIFADDR: /* set PA address */ case VKI_SIOCSIFDSTADDR: /* set remote PA address */ @@ -6016,8 +6016,8 @@ PRE(sys_ioctl) PRE_MEM_RASCIIZ( "ioctl(SIOCSIF*ADDR)", (Addr)((struct vki_ifreq *)ARG3)->vki_ifr_name ); PRE_MEM_READ( "ioctl(SIOCSIF*ADDR)", - (Addr)&((struct vki_ifreq *)ARG3)->ifr_addr, - sizeof(((struct vki_ifreq *)ARG3)->ifr_addr) ); + (Addr)&((struct vki_ifreq *)ARG3)->vki_ifr_addr, + sizeof(((struct vki_ifreq *)ARG3)->vki_ifr_addr) ); break; case VKI_SIOCSIFMETRIC: /* set metric */ PRE_MEM_RASCIIZ( "ioctl(SIOCSIFMETRIC)", @@ -6037,8 +6037,8 @@ PRE(sys_ioctl) PRE_MEM_RASCIIZ( "ioctl(SIOCSIFHWADDR)", (Addr)((struct vki_ifreq *)ARG3)->vki_ifr_name ); PRE_MEM_READ( "ioctl(SIOCSIFHWADDR)", - (Addr)&((struct vki_ifreq *)ARG3)->ifr_hwaddr, - sizeof(((struct vki_ifreq *)ARG3)->ifr_hwaddr) ); + (Addr)&((struct vki_ifreq *)ARG3)->vki_ifr_hwaddr, + sizeof(((struct vki_ifreq *)ARG3)->vki_ifr_hwaddr) ); break; case VKI_SIOCSMIIREG: /* set hardware entry registers */ PRE_MEM_RASCIIZ( "ioctl(SIOCSMIIREG)", @@ -8635,8 +8635,8 @@ POST(sys_ioctl) sizeof(((struct vki_ifreq *)ARG3)->vki_ifr_flags) ); break; case VKI_SIOCGIFHWADDR: /* Get hardware address */ - POST_MEM_WRITE( (Addr)&((struct vki_ifreq *)ARG3)->ifr_hwaddr, - sizeof(((struct vki_ifreq *)ARG3)->ifr_hwaddr) ); + POST_MEM_WRITE( (Addr)&((struct vki_ifreq *)ARG3)->vki_ifr_hwaddr, + sizeof(((struct vki_ifreq *)ARG3)->vki_ifr_hwaddr) ); break; case VKI_SIOCGIFMTU: /* get MTU size */ POST_MEM_WRITE( (Addr)&((struct vki_ifreq *)ARG3)->vki_ifr_mtu, @@ -8647,8 +8647,8 @@ POST(sys_ioctl) case VKI_SIOCGIFBRDADDR: /* get broadcast PA address */ case VKI_SIOCGIFNETMASK: /* get network PA mask */ POST_MEM_WRITE( - (Addr)&((struct vki_ifreq *)ARG3)->ifr_addr, - sizeof(((struct vki_ifreq *)ARG3)->ifr_addr) ); + (Addr)&((struct vki_ifreq *)ARG3)->vki_ifr_addr, + sizeof(((struct vki_ifreq *)ARG3)->vki_ifr_addr) ); break; case VKI_SIOCGIFMETRIC: /* get metric */ POST_MEM_WRITE( @@ -8657,14 +8657,14 @@ POST(sys_ioctl) break; case VKI_SIOCGIFMAP: /* Get device parameters */ POST_MEM_WRITE( - (Addr)&((struct vki_ifreq *)ARG3)->ifr_map, - sizeof(((struct vki_ifreq *)ARG3)->ifr_map) ); + (Addr)&((struct vki_ifreq *)ARG3)->vki_ifr_map, + sizeof(((struct vki_ifreq *)ARG3)->vki_ifr_map) ); break; break; case VKI_SIOCGIFTXQLEN: /* Get the tx queue length */ POST_MEM_WRITE( - (Addr)&((struct vki_ifreq *)ARG3)->ifr_qlen, - sizeof(((struct vki_ifreq *)ARG3)->ifr_qlen) ); + (Addr)&((struct vki_ifreq *)ARG3)->vki_ifr_qlen, + sizeof(((struct vki_ifreq *)ARG3)->vki_ifr_qlen) ); break; case VKI_SIOCGIFNAME: /* get iface name */ POST_MEM_WRITE( diff --git a/include/vki/vki-linux.h b/include/vki/vki-linux.h index 3962629cb7..0df24ddc3c 100644 --- a/include/vki/vki-linux.h +++ b/include/vki/vki-linux.h @@ -838,22 +838,22 @@ struct vki_ifreq }; #define vki_ifr_name ifr_ifrn.ifrn_name /* interface name */ -#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -#define ifr_addr ifr_ifru.ifru_addr /* address */ -#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-p lnk */ -#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ -#define ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */ +#define vki_ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ +#define vki_ifr_addr ifr_ifru.ifru_addr /* address */ +#define vki_ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-p lnk */ +#define vki_ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ +#define vki_ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */ #define vki_ifr_flags ifr_ifru.ifru_flags /* flags */ #define vki_ifr_metric ifr_ifru.ifru_ivalue /* metric */ -#define vki_ifr_mtu ifr_ifru.ifru_mtu /* mtu */ -#define ifr_map ifr_ifru.ifru_map /* device map */ -#define ifr_slave ifr_ifru.ifru_slave /* slave device */ +#define vki_ifr_mtu ifr_ifru.ifru_mtu /* mtu */ +#define vki_ifr_map ifr_ifru.ifru_map /* device map */ +#define vki_ifr_slave ifr_ifru.ifru_slave /* slave device */ #define vki_ifr_data ifr_ifru.ifru_data /* for use by interface */ #define vki_ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */ -#define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */ -#define ifr_qlen ifr_ifru.ifru_ivalue /* Queue length */ -#define ifr_newname ifr_ifru.ifru_newname /* New name */ -#define ifr_settings ifr_ifru.ifru_settings /* Device/proto settings*/ +#define vki_ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */ +#define vki_ifr_qlen ifr_ifru.ifru_ivalue /* Queue length */ +#define vki_ifr_newname ifr_ifru.ifru_newname /* New name */ +#define vki_ifr_settings ifr_ifru.ifru_settings /* Device/proto settings*/ struct vki_ifconf {