0001-remove-bzero.patch 2.8 KB

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