X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=extras%2Fezio%2Fovs-switchui.c;h=bd07e869eb6f79b8288e197b9e9734f7ef5c80af;hb=58fda1dab104041fc693032475ec4662c1a52849;hp=0f6640e0c4086f978a3ca3ce7da182c9accaa344;hpb=3f355f47f8e7343e909ccfa854454d667baf3c38;p=openvswitch diff --git a/extras/ezio/ovs-switchui.c b/extras/ezio/ovs-switchui.c index 0f6640e0..bd07e869 100644 --- a/extras/ezio/ovs-switchui.c +++ b/extras/ezio/ovs-switchui.c @@ -1247,7 +1247,7 @@ allocate_message(struct message **msgp) { if (!*msgp) { /* Allocate and initialize message. */ - *msgp = xcalloc(1, sizeof **msgp); + *msgp = xzalloc(sizeof **msgp); (*msgp)->index = n_messages; /* Add to list of messages. */ @@ -1486,7 +1486,7 @@ static int menu_show(const struct menu *, int start, bool select); static void cmd_shell(const struct dict *); static void cmd_show_version(const struct dict *); static void cmd_configure(const struct dict *); -static void cmd_setup_pki(const struct dict *); +static void cmd_set_up_pki(const struct dict *); static void cmd_browse_status(const struct dict *); static void cmd_show_motto(const struct dict *); @@ -1542,7 +1542,7 @@ menu(const struct dict *dict) menu_add_item(&menu, "Exit"); menu_add_item(&menu, "Show Version")->f = cmd_show_version; menu_add_item(&menu, "Configure")->f = cmd_configure; - menu_add_item(&menu, "Setup PKI")->f = cmd_setup_pki; + menu_add_item(&menu, "Set up PKI")->f = cmd_set_up_pki; if (debug_mode) { menu_add_item(&menu, "Browse Status")->f = cmd_browse_status; menu_add_item(&menu, "Shell")->f = cmd_shell; @@ -2889,7 +2889,7 @@ cmd_configure(const struct dict *dict UNUSED) } static void -cmd_setup_pki(const struct dict *dict UNUSED) +cmd_set_up_pki(const struct dict *dict UNUSED) { static const char def_privkey_file[] = "/etc/openflow-switch/of0-privkey.pem";