X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fovs-brcompatd.c;h=973b098b2f1e43303964d28f146e5be0f18f9450;hb=9d9a0a0452a957472b0f3a9c132aea19cfb4e568;hp=667aa661bdfc2287bd2ac5644439fcf66193f106;hpb=279c9e030818e039bb1c26be76e2cc1e8f6b13a6;p=openvswitch diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index 667aa661..973b098b 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -1289,7 +1289,6 @@ main(int argc, char *argv[]) process_init(); ovsrec_init(); - die_if_already_running(); daemonize_start(); retval = unixctl_server_create(NULL, &unixctl); @@ -1399,14 +1398,14 @@ parse_options(int argc, char *argv[]) DAEMON_OPTION_ENUMS }; static struct option long_options[] = { - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {"prune-timeout", required_argument, 0, OPT_PRUNE_TIMEOUT}, - {"appctl-command", required_argument, 0, OPT_APPCTL_COMMAND}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, + {"prune-timeout", required_argument, NULL, OPT_PRUNE_TIMEOUT}, + {"appctl-command", required_argument, NULL, OPT_APPCTL_COMMAND}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, - {0, 0, 0, 0}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options);