summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Voltz <john.voltz@gmail.com>2008-03-12 19:04:14 +0000
committerJohn Voltz <john.voltz@gmail.com>2008-03-12 19:04:14 +0000
commitb6a3e46ad24d0f02f31a92cbb87f3161f0c0576d (patch)
treefb8277fd1bcdfcfe21ae648c07c39f34953971e7
parentfb66bb3f58e23110debea0c920a8181e49885bb8 (diff)
patch to replace legacy bzero with memset in wireless-tools
-rw-r--r--package/wireless-tools/wireless-tools.mk1
-rw-r--r--package/wireless-tools/wireless_tools.29-remove-bzero.patch29
2 files changed, 30 insertions, 0 deletions
diff --git a/package/wireless-tools/wireless-tools.mk b/package/wireless-tools/wireless-tools.mk
index d1e33669b..06fe8fa76 100644
--- a/package/wireless-tools/wireless-tools.mk
+++ b/package/wireless-tools/wireless-tools.mk
@@ -20,6 +20,7 @@ $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE):
$(WIRELESS_TOOLS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE)
$(ZCAT) $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(WIRELESS_TOOLS_BUILD_DIR) package/wireless-tools/ \*.patch
sed -i -e s:'strip':'$(STRIPCMD)':g $(WIRELESS_TOOLS_BUILD_DIR)/Makefile
touch $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked
diff --git a/package/wireless-tools/wireless_tools.29-remove-bzero.patch b/package/wireless-tools/wireless_tools.29-remove-bzero.patch
new file mode 100644
index 000000000..4714b317b
--- /dev/null
+++ b/package/wireless-tools/wireless_tools.29-remove-bzero.patch
@@ -0,0 +1,29 @@
+--- a/iwlib.c 2007-06-29 19:43:31.000000000 -0400
++++ b/iwlib.c 2008-03-12 14:18:48.000000000 -0400
+@@ -475,7 +475,7 @@ iw_get_range_info(int skfd,
+ union iw_range_raw * range_raw;
+
+ /* Cleanup */
+- bzero(buffer, sizeof(buffer));
++ memset(buffer, 0, sizeof(buffer));
+
+ wrq.u.data.pointer = (caddr_t) buffer;
+ wrq.u.data.length = sizeof(buffer);
+@@ -504,7 +504,7 @@ iw_get_range_info(int skfd,
+ else
+ {
+ /* Zero unknown fields */
+- bzero((char *) range, sizeof(struct iw_range));
++ memset((char *) range, 0, sizeof(struct iw_range));
+
+ /* Initial part unmoved */
+ memcpy((char *) range,
+@@ -2960,7 +2960,7 @@ iw_process_scanning_token(struct iw_even
+ oldwscan->next = wscan;
+
+ /* Reset it */
+- bzero(wscan, sizeof(struct wireless_scan));
++ memset(wscan, 0, sizeof(struct wireless_scan));
+
+ /* Save cell identifier */
+ wscan->has_ap_addr = 1;