diff options
author | Ben Pfaff <blp@nicira.com> | 2010-02-11 11:11:23 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2010-02-11 11:11:23 -0800 |
commit | c69ee87c10818267f991236201150b1fa51ae519 (patch) | |
tree | abea72de06ca718ef0296b88ee84a1bf889fed8c /tests/test-reconnect.c | |
parent | 62ee3464d99c0e37f38b503321cd46181c5c7617 (diff) | |
parent | 67a4917b07031b387beafaedce413b4207214059 (diff) |
Merge "master" into "next".
The main change here is the need to update all of the uses of UNUSED in
the next branch to OVS_UNUSED as it is now spelled on "master".
Diffstat (limited to 'tests/test-reconnect.c')
-rw-r--r-- | tests/test-reconnect.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/test-reconnect.c b/tests/test-reconnect.c index 8441fadd..93991ff5 100644 --- a/tests/test-reconnect.c +++ b/tests/test-reconnect.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. @@ -86,19 +86,19 @@ main(void) } static void -do_enable(int argc UNUSED, char *argv[] UNUSED) +do_enable(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { reconnect_enable(reconnect, now); } static void -do_disable(int argc UNUSED, char *argv[] UNUSED) +do_disable(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { reconnect_disable(reconnect, now); } static void -do_force_reconnect(int argc UNUSED, char *argv[] UNUSED) +do_force_reconnect(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { reconnect_force_reconnect(reconnect, now); } @@ -118,31 +118,31 @@ error_from_string(const char *s) } static void -do_disconnected(int argc UNUSED, char *argv[]) +do_disconnected(int argc OVS_UNUSED, char *argv[]) { reconnect_disconnected(reconnect, now, error_from_string(argv[1])); } static void -do_connecting(int argc UNUSED, char *argv[] UNUSED) +do_connecting(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { reconnect_connecting(reconnect, now); } static void -do_connect_failed(int argc UNUSED, char *argv[]) +do_connect_failed(int argc OVS_UNUSED, char *argv[]) { reconnect_connect_failed(reconnect, now, error_from_string(argv[1])); } static void -do_connected(int argc UNUSED, char *argv[] UNUSED) +do_connected(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { reconnect_connected(reconnect, now); } static void -do_received(int argc UNUSED, char *argv[] UNUSED) +do_received(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { reconnect_received(reconnect, now); } @@ -179,13 +179,13 @@ do_run(int argc, char *argv[]) } static void -do_advance(int argc UNUSED, char *argv[]) +do_advance(int argc OVS_UNUSED, char *argv[]) { now += atoi(argv[1]); } static void -do_timeout(int argc UNUSED, char *argv[] UNUSED) +do_timeout(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { int timeout = reconnect_timeout(reconnect, now); if (timeout >= 0) { @@ -197,7 +197,7 @@ do_timeout(int argc UNUSED, char *argv[] UNUSED) } static void -do_set_max_tries(int argc UNUSED, char *argv[]) +do_set_max_tries(int argc OVS_UNUSED, char *argv[]) { reconnect_set_max_tries(reconnect, atoi(argv[1])); } |