1*4882a593SmuzhiyunSwitch all instances of deprecated bzero() to memset() equivalent. 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunSigned-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> 4*4882a593Smuzhiyun 5*4882a593Smuzhiyundiff -Nura wireless_tools.30/ifrename.c wireless_tools.30-bzero/ifrename.c 6*4882a593Smuzhiyun--- wireless_tools.30/ifrename.c 2007-10-16 20:12:41.000000000 -0300 7*4882a593Smuzhiyun+++ wireless_tools.30-bzero/ifrename.c 2014-06-11 09:52:59.623741119 -0300 8*4882a593Smuzhiyun@@ -541,7 +541,7 @@ 9*4882a593Smuzhiyun victimname, autoname); 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun /* Prepare request */ 12*4882a593Smuzhiyun- bzero(&ifr, sizeof(struct ifreq)); 13*4882a593Smuzhiyun+ memset(&ifr, 0, sizeof(struct ifreq)); 14*4882a593Smuzhiyun strncpy(ifr.ifr_name, victimname, IFNAMSIZ); 15*4882a593Smuzhiyun strncpy(ifr.ifr_newname, autoname, IFNAMSIZ); 16*4882a593Smuzhiyun 17*4882a593Smuzhiyun@@ -587,7 +587,7 @@ 18*4882a593Smuzhiyun } 19*4882a593Smuzhiyun 20*4882a593Smuzhiyun /* Prepare request */ 21*4882a593Smuzhiyun- bzero(&ifr, sizeof(struct ifreq)); 22*4882a593Smuzhiyun+ memset(&ifr, 0, sizeof(struct ifreq)); 23*4882a593Smuzhiyun strncpy(ifr.ifr_name, oldname, IFNAMSIZ); 24*4882a593Smuzhiyun strncpy(ifr.ifr_newname, newname, IFNAMSIZ); 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun@@ -747,7 +747,7 @@ 27*4882a593Smuzhiyun int i; 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun /* Get MAC address */ 30*4882a593Smuzhiyun- bzero(&ifr, sizeof(struct ifreq)); 31*4882a593Smuzhiyun+ memset(&ifr, 0, sizeof(struct ifreq)); 32*4882a593Smuzhiyun strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 33*4882a593Smuzhiyun ret = ioctl(skfd, SIOCGIFHWADDR, &ifr); 34*4882a593Smuzhiyun if(ret < 0) 35*4882a593Smuzhiyun@@ -1040,8 +1040,8 @@ 36*4882a593Smuzhiyun return(0); 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun /* Prepare request */ 39*4882a593Smuzhiyun- bzero(&ifr, sizeof(struct ifreq)); 40*4882a593Smuzhiyun- bzero(&drvinfo, sizeof(struct ethtool_drvinfo)); 41*4882a593Smuzhiyun+ memset(&ifr, 0, sizeof(struct ifreq)); 42*4882a593Smuzhiyun+ memset(&drvinfo, 0, sizeof(struct ethtool_drvinfo)); 43*4882a593Smuzhiyun strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 44*4882a593Smuzhiyun drvinfo.cmd = ETHTOOL_GDRVINFO; 45*4882a593Smuzhiyun ifr.ifr_data = (caddr_t) &drvinfo; 46*4882a593Smuzhiyun@@ -1206,8 +1206,8 @@ 47*4882a593Smuzhiyun return(0); 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun /* Prepare request */ 50*4882a593Smuzhiyun- bzero(&ifr, sizeof(struct ifreq)); 51*4882a593Smuzhiyun- bzero(&map, sizeof(struct ifmap)); 52*4882a593Smuzhiyun+ memset(&ifr, 0, sizeof(struct ifreq)); 53*4882a593Smuzhiyun+ memset(&map, 0, sizeof(struct ifmap)); 54*4882a593Smuzhiyun strncpy(ifr.ifr_name, ifname, IFNAMSIZ); 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun /* Do it */ 57*4882a593Smuzhiyun@@ -2050,7 +2050,7 @@ 58*4882a593Smuzhiyun struct add_extra extrainfo; 59*4882a593Smuzhiyun 60*4882a593Smuzhiyun /* Reset the list of filters */ 61*4882a593Smuzhiyun- bzero(selector_active, sizeof(selector_active)); 62*4882a593Smuzhiyun+ memset(selector_active, 0, sizeof(selector_active)); 63*4882a593Smuzhiyun 64*4882a593Smuzhiyun /* Check filename */ 65*4882a593Smuzhiyun if(!strcmp(filename, "-")) 66*4882a593Smuzhiyundiff -Nura wireless_tools.30/iwlib.c wireless_tools.30-bzero/iwlib.c 67*4882a593Smuzhiyun--- wireless_tools.30/iwlib.c 2009-11-23 23:28:59.000000000 -0300 68*4882a593Smuzhiyun+++ wireless_tools.30-bzero/iwlib.c 2014-06-11 09:50:20.611371384 -0300 69*4882a593Smuzhiyun@@ -484,7 +484,7 @@ 70*4882a593Smuzhiyun union iw_range_raw * range_raw; 71*4882a593Smuzhiyun 72*4882a593Smuzhiyun /* Cleanup */ 73*4882a593Smuzhiyun- bzero(buffer, sizeof(buffer)); 74*4882a593Smuzhiyun+ memset(buffer, 0, sizeof(buffer)); 75*4882a593Smuzhiyun 76*4882a593Smuzhiyun wrq.u.data.pointer = (caddr_t) buffer; 77*4882a593Smuzhiyun wrq.u.data.length = sizeof(buffer); 78*4882a593Smuzhiyun@@ -513,7 +513,7 @@ 79*4882a593Smuzhiyun else 80*4882a593Smuzhiyun { 81*4882a593Smuzhiyun /* Zero unknown fields */ 82*4882a593Smuzhiyun- bzero((char *) range, sizeof(struct iw_range)); 83*4882a593Smuzhiyun+ memset((char *) range, 0, sizeof(struct iw_range)); 84*4882a593Smuzhiyun 85*4882a593Smuzhiyun /* Initial part unmoved */ 86*4882a593Smuzhiyun memcpy((char *) range, 87*4882a593Smuzhiyun@@ -3064,7 +3064,7 @@ 88*4882a593Smuzhiyun oldwscan->next = wscan; 89*4882a593Smuzhiyun 90*4882a593Smuzhiyun /* Reset it */ 91*4882a593Smuzhiyun- bzero(wscan, sizeof(struct wireless_scan)); 92*4882a593Smuzhiyun+ memset(wscan, 0, sizeof(struct wireless_scan)); 93*4882a593Smuzhiyun 94*4882a593Smuzhiyun /* Save cell identifier */ 95*4882a593Smuzhiyun wscan->has_ap_addr = 1; 96