projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hash: Prevent warnings about strict aliasing rules.
[openvswitch]
/
extras
/
ezio
/
ovs-switchui.c
diff --git
a/extras/ezio/ovs-switchui.c
b/extras/ezio/ovs-switchui.c
index cd1f3521c21273a88697c2a9cdd42bcc6c6849ce..864e34c1e744895a1ade9030d2253bc45ddeed09 100644
(file)
--- a/
extras/ezio/ovs-switchui.c
+++ b/
extras/ezio/ovs-switchui.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008, 2009 Nicira Networks, Inc.
+/* Copyright (c) 2008, 2009
, 2010
Nicira Networks, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-165,7
+165,7
@@
main(int argc, char *argv[])
daemonize();
initialize_terminal();
daemonize();
initialize_terminal();
- fatal_signal_add_hook(restore_terminal, NULL, true);
+ fatal_signal_add_hook(restore_terminal, NULL,
NULL,
true);
msg = NULL;
countdown = 0;
msg = NULL;
countdown = 0;
@@
-1247,7
+1247,7
@@
allocate_message(struct message **msgp)
{
if (!*msgp) {
/* Allocate and initialize message. */
{
if (!*msgp) {
/* Allocate and initialize message. */
- *msgp = x
calloc(1,
sizeof **msgp);
+ *msgp = x
zalloc(
sizeof **msgp);
(*msgp)->index = n_messages;
/* Add to list of messages. */
(*msgp)->index = n_messages;
/* Add to list of messages. */
@@
-2079,7
+2079,7
@@
save_config(const struct svec *settings)
}
svec_init(&argv);
}
svec_init(&argv);
- svec_add(&argv, "/usr/share/openvswitch
/commands
/reconfigure");
+ svec_add(&argv, "/usr/share/openvswitch
-switchui
/reconfigure");
svec_append(&argv, settings);
svec_terminate(&argv);
ok = run_and_report_failure(argv.names, "Save failed");
svec_append(&argv, settings);
svec_terminate(&argv);
ok = run_and_report_failure(argv.names, "Save failed");
@@
-2478,7
+2478,7
@@
choose_netdevs(struct svec *choices)
continue;
}
continue;
}
- retval = netdev_open
(name, NETDEV_ETH_TYPE_NONE
, &netdev);
+ retval = netdev_open
_default(name
, &netdev);
if (!retval) {
bool exclude = netdev_get_in4(netdev, NULL, NULL) == 0;
netdev_close(netdev);
if (!retval) {
bool exclude = netdev_get_in4(netdev, NULL, NULL) == 0;
netdev_close(netdev);