X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=80c8fedaefe748bccf9cfe07b18907292dc56730;hb=825da1c6d1c7b9bc5128d7588b8bad6efaae650e;hp=78ebd3194a1e3d682cc42fc43c3860c31e755be1;hpb=07fc4ed3410006950012aef8d78f017c5b833e98;p=sliver-openvswitch.git diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 78ebd3194..80c8fedae 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -32,7 +32,6 @@ #include "dirs.h" #include "dpif.h" #include "dummy.h" -#include "leak-checker.h" #include "memory.h" #include "netdev.h" #include "openflow/openflow.h" @@ -140,7 +139,6 @@ main(int argc, char *argv[]) } bridge_exit(); unixctl_server_destroy(unixctl); - signal_unregister(sighup); return 0; } @@ -153,7 +151,6 @@ parse_options(int argc, char *argv[], char **unixctl_pathp) OPT_MLOCKALL, OPT_UNIXCTL, VLOG_OPTION_ENUMS, - LEAK_CHECKER_OPTION_ENUMS, OPT_BOOTSTRAP_CA_CERT, OPT_ENABLE_DUMMY, OPT_DISABLE_SYSTEM, @@ -166,7 +163,6 @@ parse_options(int argc, char *argv[], char **unixctl_pathp) {"unixctl", required_argument, NULL, OPT_UNIXCTL}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, - LEAK_CHECKER_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS, {"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT}, {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT}, @@ -202,7 +198,6 @@ parse_options(int argc, char *argv[], char **unixctl_pathp) VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS - LEAK_CHECKER_OPTION_HANDLERS STREAM_SSL_OPTION_HANDLERS case OPT_PEER_CA_CERT: @@ -261,7 +256,6 @@ usage(void) " --unixctl=SOCKET override default control socket name\n" " -h, --help display this help message\n" " -V, --version display version information\n"); - leak_checker_usage(); exit(EXIT_SUCCESS); }