diff options
author | Ben Pfaff <blp@nicira.com> | 2010-02-11 10:59:47 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2010-02-11 10:59:47 -0800 |
commit | 67a4917b07031b387beafaedce413b4207214059 (patch) | |
tree | 0b14aebd79b746f7f5d943be9829cd359fcb49c5 /tests | |
parent | 193ec5109dedb23058dfa734545313b5b3ba10c8 (diff) |
Rename UNUSED macro to OVS_UNUSED to avoid naming conflict.
Requested by Jean Tourrilhes <jt@hpl.hp.com>.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test-dhcp-client.c | 4 | ||||
-rw-r--r-- | tests/test-flows.c | 4 | ||||
-rw-r--r-- | tests/test-hmap.c | 4 | ||||
-rw-r--r-- | tests/test-vconn.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/test-dhcp-client.c b/tests/test-dhcp-client.c index e4471c7b..f38d438f 100644 --- a/tests/test-dhcp-client.c +++ b/tests/test-dhcp-client.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,7 +95,7 @@ release(void *cli_) } static void -modify_dhcp_request(struct dhcp_msg *msg, void *aux UNUSED) +modify_dhcp_request(struct dhcp_msg *msg, void *aux OVS_UNUSED) { if (vendor_class) { dhcp_msg_put_string(msg, DHCP_CODE_VENDOR_CLASS, vendor_class); diff --git a/tests/test-flows.c b/tests/test-flows.c index 6e0b7736..451ca1ad 100644 --- a/tests/test-flows.c +++ b/tests/test-flows.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ #include <assert.h> int -main(int argc UNUSED, char *argv[]) +main(int argc OVS_UNUSED, char *argv[]) { struct ofp_match expected_match; FILE *flows, *pcap; diff --git a/tests/test-hmap.c b/tests/test-hmap.c index cf6ee1c9..18d8f461 100644 --- a/tests/test-hmap.c +++ b/tests/test-hmap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -157,7 +157,7 @@ good_hash(int value) } static size_t -constant_hash(int value UNUSED) +constant_hash(int value OVS_UNUSED) { return 123; } diff --git a/tests/test-vconn.c b/tests/test-vconn.c index 1bcd8c62..ff4d9ece 100644 --- a/tests/test-vconn.c +++ b/tests/test-vconn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -346,7 +346,7 @@ test_send_invalid_version_hello(const char *type) } int -main(int argc UNUSED, char *argv[]) +main(int argc OVS_UNUSED, char *argv[]) { set_program_name(argv[0]); time_init(); |