Module Name: src
Committed By: plunky
Date: Sat Sep 15 18:37:28 UTC 2012
Modified Files:
src/external/bsd/wpa/dist/src/drivers: driver_test.c
src/external/bsd/wpa/dist/src/utils: eloop.c trace.h
Log Message:
WPA_TRACE_REF() provides optional content, potentially leaving an extra
semicolon within the struct declarator list. This is not permitted
according to C99 "6.7.2.1 Structure and union specifiers", so instead
have the macro provide the semicolon as required.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/wpa/dist/src/drivers/driver_test.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/wpa/dist/src/utils/eloop.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/wpa/dist/src/utils/trace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/src/drivers/driver_test.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_test.c:1.1.1.1 src/external/bsd/wpa/dist/src/drivers/driver_test.c:1.2
--- src/external/bsd/wpa/dist/src/drivers/driver_test.c:1.1.1.1 Wed Aug 4 10:21:50 2010
+++ src/external/bsd/wpa/dist/src/drivers/driver_test.c Sat Sep 15 18:37:27 2012
@@ -70,7 +70,7 @@ struct wpa_driver_test_global {
struct wpa_driver_test_data {
struct wpa_driver_test_global *global;
void *ctx;
- WPA_TRACE_REF(ctx);
+ WPA_TRACE_REF(ctx)
u8 own_addr[ETH_ALEN];
int test_socket;
#ifdef DRIVER_TEST_UNIX
Index: src/external/bsd/wpa/dist/src/utils/eloop.c
diff -u src/external/bsd/wpa/dist/src/utils/eloop.c:1.1.1.2 src/external/bsd/wpa/dist/src/utils/eloop.c:1.2
--- src/external/bsd/wpa/dist/src/utils/eloop.c:1.1.1.2 Sat Sep 10 20:54:05 2011
+++ src/external/bsd/wpa/dist/src/utils/eloop.c Sat Sep 15 18:37:28 2012
@@ -25,8 +25,8 @@ struct eloop_sock {
void *eloop_data;
void *user_data;
eloop_sock_handler handler;
- WPA_TRACE_REF(eloop);
- WPA_TRACE_REF(user);
+ WPA_TRACE_REF(eloop)
+ WPA_TRACE_REF(user)
WPA_TRACE_INFO
};
@@ -36,8 +36,8 @@ struct eloop_timeout {
void *eloop_data;
void *user_data;
eloop_timeout_handler handler;
- WPA_TRACE_REF(eloop);
- WPA_TRACE_REF(user);
+ WPA_TRACE_REF(eloop)
+ WPA_TRACE_REF(user)
WPA_TRACE_INFO
};
Index: src/external/bsd/wpa/dist/src/utils/trace.h
diff -u src/external/bsd/wpa/dist/src/utils/trace.h:1.1.1.1 src/external/bsd/wpa/dist/src/utils/trace.h:1.2
--- src/external/bsd/wpa/dist/src/utils/trace.h:1.1.1.1 Wed Aug 4 10:18:41 2010
+++ src/external/bsd/wpa/dist/src/utils/trace.h Sat Sep 15 18:37:28 2012
@@ -29,7 +29,7 @@ struct wpa_trace_ref {
const void *addr;
WPA_TRACE_INFO
};
-#define WPA_TRACE_REF(name) struct wpa_trace_ref wpa_trace_ref_##name
+#define WPA_TRACE_REF(name) struct wpa_trace_ref wpa_trace_ref_##name;
#define wpa_trace_dump(title, ptr) \
wpa_trace_dump_func((title), (ptr)->btrace, (ptr)->btrace_num)
