You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

33 lines
1.1 KiB

  1. --- a/src/dcwproto.c
  2. +++ b/src/dcwproto.c
  3. @@ -20,12 +20,8 @@
  4. -#ifdef WIN32
  5. -#define bzero(ptr, size) memset(ptr, 0, size)
  6. -#else
  7. #include <config.h>
  8. #include <strings.h>
  9. -#endif
  10. #include <dcwproto.h>
  11. #include <string.h>
  12. @@ -95,7 +91,7 @@ dcwmsg_marshal_sta_ack(struct dcwmsg_sta_ack * const output, const unsigned char
  13. /* copy in the data ssid string bytes */
  14. if (buf_len < copy_size) return 0;
  15. - bzero(output->bonded_data_channels[i].ssid, sizeof(output->bonded_data_channels[i].ssid));
  16. + memset(output->bonded_data_channels[i].ssid, 0, sizeof(output->bonded_data_channels[i].ssid));
  17. memcpy(output->bonded_data_channels[i].ssid, buf, copy_size);
  18. buf_len -= copy_size;
  19. buf += copy_size;
  20. @@ -134,7 +130,7 @@ dcwmsg_marshal_ap_accept_sta(struct dcwmsg_ap_accept_sta * const output, const u
  21. /* copy in the data ssid string bytes */
  22. if (buf_len < copy_size) return 0;
  23. - bzero(output->data_ssids[i], sizeof(output->data_ssids[i]));
  24. + memset(output->data_ssids[i], 0, sizeof(output->data_ssids[i]));
  25. memcpy(output->data_ssids[i], buf, copy_size);
  26. buf_len -= copy_size;
  27. buf += copy_size;