diff options
author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-10-22 15:35:26 +0200 |
---|---|---|
committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-10-22 15:35:26 +0200 |
commit | dc41c0ebfae020368ccf832f0fe0528ceb137f2c (patch) | |
tree | 7e54905bc6b074936667151cba7a0982b069bb1e | |
parent | e7e5729f46812929e2acbde19d99eea7e7929670 (diff) | |
download | ouroboros-dc41c0ebfae020368ccf832f0fe0528ceb137f2c.tar.gz ouroboros-dc41c0ebfae020368ccf832f0fe0528ceb137f2c.zip |
irmd, tools: Fix missing initializers
The BSD compiler requires explicit initializers for all fields with
the -Wmissing-field-initializers flag enabled
On branch be-fix-build # Changes to be committed: # modified:
src/irmd/main.c # modified: src/tools/irm/irm.c # modified:
src/tools/irm/irm_bind.c # modified: src/tools/irm/irm_ipcp.c #
modified: src/tools/irm/irm_unbind.c # # Untracked files: #
killouroboros.sh # start.sh #
-rw-r--r-- | src/irmd/main.c | 4 | ||||
-rw-r--r-- | src/tools/irm/irm.c | 14 | ||||
-rw-r--r-- | src/tools/irm/irm_bind.c | 2 | ||||
-rw-r--r-- | src/tools/irm/irm_ipcp.c | 12 | ||||
-rw-r--r-- | src/tools/irm/irm_unbind.c | 2 |
5 files changed, 18 insertions, 16 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c index 4dee4b91..390681a8 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -1993,7 +1993,7 @@ void * mainloop(void * o) static int irm_create(void) { - struct stat st = {0}; + struct stat st; struct timeval timeout = {(IRMD_ACCEPT_TIMEOUT / 1000), (IRMD_ACCEPT_TIMEOUT % 1000) * 1000}; @@ -2001,6 +2001,8 @@ static int irm_create(void) if (irmd == NULL) return -ENOMEM; + memset(&st, 0, sizeof(st)); + irmd->state = IRMD_NULL; if (pthread_rwlock_init(&irmd->state_lock, NULL)) { diff --git a/src/tools/irm/irm.c b/src/tools/irm/irm.c index be758098..320ce97a 100644 --- a/src/tools/irm/irm.c +++ b/src/tools/irm/irm.c @@ -47,13 +47,13 @@ static const struct cmd { const char * cmd; int (* func)(int argc, char ** argv); } cmds[] = { - { "ipcp", ipcp_cmd }, - { "bind", bind_cmd }, - { "unbind", unbind_cmd }, - { "register", do_register }, - { "unregister", do_unregister }, - { "help", do_help }, - { 0 } + { "ipcp", ipcp_cmd }, + { "bind", bind_cmd }, + { "unbind", unbind_cmd }, + { "register", do_register }, + { "unregister", do_unregister }, + { "help", do_help }, + { NULL, NULL } }; static int do_cmd(const char * argv0, diff --git a/src/tools/irm/irm_bind.c b/src/tools/irm/irm_bind.c index bb441573..aafa2f75 100644 --- a/src/tools/irm/irm_bind.c +++ b/src/tools/irm/irm_bind.c @@ -51,7 +51,7 @@ static const struct cmd { { "api", do_bind_api }, { "ipcp", do_bind_ipcp }, { "help", do_help }, - { 0 } + { NULL, NULL } }; static int do_cmd(const char * argv0, diff --git a/src/tools/irm/irm_ipcp.c b/src/tools/irm/irm_ipcp.c index 795281bb..004bbbe0 100644 --- a/src/tools/irm/irm_ipcp.c +++ b/src/tools/irm/irm_ipcp.c @@ -45,12 +45,12 @@ static const struct cmd { const char * cmd; int (* func)(int argc, char ** argv); } cmds[] = { - { "create", do_create_ipcp }, - { "destroy", do_destroy_ipcp }, - { "bootstrap", do_bootstrap_ipcp }, - { "enroll", do_enroll_ipcp }, - { "help", do_help }, - { 0 } + { "create", do_create_ipcp }, + { "destroy", do_destroy_ipcp }, + { "bootstrap", do_bootstrap_ipcp }, + { "enroll", do_enroll_ipcp }, + { "help", do_help }, + { NULL, NULL } }; static int do_cmd(const char * argv0, diff --git a/src/tools/irm/irm_unbind.c b/src/tools/irm/irm_unbind.c index 5d167e1c..a6b27907 100644 --- a/src/tools/irm/irm_unbind.c +++ b/src/tools/irm/irm_unbind.c @@ -51,7 +51,7 @@ static const struct cmd { { "api", do_unbind_api }, { "ipcp", do_unbind_ipcp }, { "help", do_help }, - { 0 } + { NULL, NULL } }; static int do_cmd(const char * argv0, int argc, char ** argv) |