LU-6210 utils: Use C99 initializers in lfs_setquota_times()

[fs/lustre-release.git] / lnet / utils / lnetctl.c

diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c
index 2707787..70c986a 100644 (file)
--- a/lnet/utils/lnetctl.c
+++ b/lnet/utils/lnetctl.c
@@ -32,7 +32,7 @@
 #include <libcfs/util/parser.h>
 #include <lnet/lnetctl.h>
 #include <lnet/nidstr.h>
-#include "cyaml/cyaml.h"
+#include <cyaml.h>
 #include "lnetconfig/liblnetconfig.h"
 
 #define LNET_CONFIGURE         true
@@ -58,6 +58,7 @@ static int jt_set_numa(int argc, char **argv);
 static int jt_add_peer_nid(int argc, char **argv);
 static int jt_del_peer_nid(int argc, char **argv);
 /*static int jt_show_peer(int argc, char **argv);*/
+static int lnetctl_list_commands(int argc, char **argv);
 
 command_t lnet_cmds[] = {
        {"configure", jt_config_lnet, 0, "configure lnet\n"
@@ -188,9 +189,9 @@ static int handle_help(const command_t *cmd_list, const char *cmd,
        opterr = 0;
 
        const char *const short_options = "h";
-       const struct option long_options[] = {
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
+       static const struct option long_options[] = {
+               { .name = "help", .has_arg = no_argument, .val = 'h' },
+               { .name = NULL }
        };
 
        while ((opt = getopt_long(argc, argv, short_options,
@@ -229,7 +230,7 @@ static int jt_set_numa(int argc, char **argv)
                return -1;
        }
 
-       rc = lustre_lnet_config_buffers(value, -1, -1, -1, &err_rc);
+       rc = lustre_lnet_config_numa_range(value, -1, &err_rc);
        if (rc != LUSTRE_CFG_RC_NO_ERR)
                cYAML_print_tree2file(stderr, err_rc);
 
@@ -356,10 +357,10 @@ static int jt_config_lnet(int argc, char **argv)
        int rc, opt;
 
        const char *const short_options = "ah";
-       const struct option long_options[] = {
-               { "all", 0, NULL, 'a' },
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
+       static const struct option long_options[] = {
+               { .name = "all",  .has_arg = no_argument, .val = 'a' },
+               { .name = "help", .has_arg = no_argument, .val = 'h' },
+               { .name = NULL }
        };
 
        while ((opt = getopt_long(argc, argv, short_options,
@@ -412,14 +413,13 @@ static int jt_add_route(int argc, char **argv)
        int rc, opt;
 
        const char *const short_options = "n:g:c:p:h";
-       const struct option long_options[] = {
-               { "net", 1, NULL, 'n' },
-               { "gateway", 1, NULL, 'g' },
-               { "hop-count", 1, NULL, 'c' },
-               { "priority", 1, NULL, 'p' },
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
-       };
+       static const struct option long_options[] = {
+       { .name = "net",       .has_arg = required_argument, .val = 'n' },
+       { .name = "gateway",   .has_arg = required_argument, .val = 'g' },
+       { .name = "hop-count", .has_arg = required_argument, .val = 'c' },
+       { .name = "priority",  .has_arg = required_argument, .val = 'p' },
+       { .name = "help",      .has_arg = no_argument,       .val = 'h' },
+       { .name = NULL } };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                   long_options, NULL)) != -1) {
@@ -479,18 +479,18 @@ static int jt_add_ni(int argc, char **argv)
        lustre_lnet_init_nw_descr(&nw_descr);
 
        const char *const short_options = "n:i:p:t:c:b:r:s:h";
-       const struct option long_options[] = {
-               { "net", 1, NULL, 'n' },
-               { "if", 1, NULL, 'i' },
-               { "ip2net", 1, NULL, 'p' },
-               { "peer-timeout", 1, NULL, 't' },
-               { "peer-credits", 1, NULL, 'c' },
-               { "peer-buffer-credits", 1, NULL, 'b' },
-               { "credits", 1, NULL, 'r' },
-               { "cpt", 1, NULL, 's' },
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
-       };
+       static const struct option long_options[] = {
+       { .name = "net",          .has_arg = required_argument, .val = 'n' },
+       { .name = "if",           .has_arg = required_argument, .val = 'i' },
+       { .name = "ip2net",       .has_arg = required_argument, .val = 'p' },
+       { .name = "peer-timeout", .has_arg = required_argument, .val = 't' },
+       { .name = "peer-credits", .has_arg = required_argument, .val = 'c' },
+       { .name = "peer-buffer-credits",
+                                 .has_arg = required_argument, .val = 'b' },
+       { .name = "credits",      .has_arg = required_argument, .val = 'r' },
+       { .name = "cpt",          .has_arg = required_argument, .val = 's' },
+       { .name = "help",         .has_arg = no_argument,       .val = 'h' },
+       { .name = NULL } };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                   long_options, NULL)) != -1) {
@@ -587,12 +587,11 @@ static int jt_del_route(int argc, char **argv)
        int rc, opt;
 
        const char *const short_options = "n:g:h";
-       const struct option long_options[] = {
-               { "net", 1, NULL, 'n' },
-               { "gateway", 1, NULL, 'g' },
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
-       };
+       static const struct option long_options[] = {
+               { .name = "net",     .has_arg = required_argument, .val = 'n' },
+               { .name = "gateway", .has_arg = required_argument, .val = 'g' },
+               { .name = "help",    .has_arg = no_argument,       .val = 'h' },
+               { .name = NULL } };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                   long_options, NULL)) != -1) {
@@ -630,12 +629,11 @@ static int jt_del_ni(int argc, char **argv)
        lustre_lnet_init_nw_descr(&nw_descr);
 
        const char *const short_options = "n:i:h";
-       const struct option long_options[] = {
-               { "net", 1, NULL, 'n' },
-               { "if", 1, NULL, 'i' },
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
-       };
+       static const struct option long_options[] = {
+       { .name = "net",        .has_arg = required_argument,   .val = 'n' },
+       { .name = "if",         .has_arg = required_argument,   .val = 'i' },
+       { .name = "help",       .has_arg = no_argument,         .val = 'h' },
+       { .name = NULL } };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                   long_options, NULL)) != -1) {
@@ -679,15 +677,14 @@ static int jt_show_route(int argc, char **argv)
        struct cYAML *err_rc = NULL, *show_rc = NULL;
 
        const char *const short_options = "n:g:h:p:vh";
-       const struct option long_options[] = {
-               { "net", 1, NULL, 'n' },
-               { "gateway", 1, NULL, 'g' },
-               { "hop-count", 1, NULL, 'c' },
-               { "priority", 1, NULL, 'p' },
-               { "verbose", 0, NULL, 'v' },
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
-       };
+       static const struct option long_options[] = {
+       { .name = "net",       .has_arg = required_argument, .val = 'n' },
+       { .name = "gateway",   .has_arg = required_argument, .val = 'g' },
+       { .name = "hop-count", .has_arg = required_argument, .val = 'c' },
+       { .name = "priority",  .has_arg = required_argument, .val = 'p' },
+       { .name = "verbose",   .has_arg = no_argument,       .val = 'v' },
+       { .name = "help",      .has_arg = no_argument,       .val = 'h' },
+       { .name = NULL } };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                   long_options, NULL)) != -1) {
@@ -746,12 +743,11 @@ static int jt_show_net(int argc, char **argv)
        struct cYAML *err_rc = NULL, *show_rc = NULL;
 
        const char *const short_options = "n:vh";
-       const struct option long_options[] = {
-               { "net", 1, NULL, 'n' },
-               { "verbose", 0, NULL, 'v' },
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
-       };
+       static const struct option long_options[] = {
+               { .name = "net",     .has_arg = required_argument, .val = 'n' },
+               { .name = "verbose", .has_arg = no_argument,       .val = 'v' },
+               { .name = "help",    .has_arg = no_argument,       .val = 'h' },
+               { .name = NULL } };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                   long_options, NULL)) != -1) {
@@ -951,13 +947,12 @@ static int jt_import(int argc, char **argv)
        char cmd = 'a';
 
        const char *const short_options = "adsh";
-       const struct option long_options[] = {
-               { "add", 0, NULL, 'a' },
-               { "del", 0, NULL, 'd' },
-               { "show", 0, NULL, 's' },
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
-       };
+       static const struct option long_options[] = {
+               { .name = "add",  .has_arg = no_argument, .val = 'a' },
+               { .name = "del",  .has_arg = no_argument, .val = 'd' },
+               { .name = "show", .has_arg = no_argument, .val = 's' },
+               { .name = "help", .has_arg = no_argument, .val = 'h' },
+               { .name = NULL } };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                   long_options, NULL)) != -1) {
@@ -1018,10 +1013,9 @@ static int jt_export(int argc, char **argv)
        FILE *f = NULL;
 
        const char *const short_options = "h";
-       const struct option long_options[] = {
-               { "help", 0, NULL, 'h' },
-               { NULL, 0, NULL, 0 },
-       };
+       static const struct option long_options[] = {
+               { .name = "help", .has_arg = no_argument, .val = 'h' },
+               { .name = NULL } };
 
        while ((opt = getopt_long(argc, argv, short_options,
                                   long_options, NULL)) != -1) {
@@ -1132,9 +1126,12 @@ static int jt_add_peer_nid(int argc, char **argv)
                                         !non_mr, -1, &err_rc);
 
 failed:
-       for (i = 0; i < size; i++)
-               free(nids[i]);
-       free(nids);
+       if (nids) {
+               /* free the array of nids */
+               for (i = 0; i < size; i++)
+                       free(nids[i]);
+               free(nids);
+       }
 
        if (rc != LUSTRE_CFG_RC_NO_ERR)
                cYAML_print_tree2file(stderr, err_rc);
@@ -1184,9 +1181,11 @@ static int jt_del_peer_nid(int argc, char **argv)
        rc = lustre_lnet_del_peer_nid(prim_nid, nids, size, -1, &err_rc);
 
 failed:
-       for (i = 0; i < size; i++)
-               free(nids[i]);
-       free(nids);
+       if (nids) {
+               for (i = 0; i < size; i++)
+                       free(nids[i]);
+               free(nids);
+       }
 
        if (rc != LUSTRE_CFG_RC_NO_ERR)
                cYAML_print_tree2file(stderr, err_rc);
@@ -1257,9 +1256,19 @@ command_t list[] = {
        {"help", Parser_help, 0, "help"},
        {"exit", Parser_quit, 0, "quit"},
        {"quit", Parser_quit, 0, "quit"},
+       {"--list-commands", lnetctl_list_commands, 0, "list commands"},
        { 0, 0, 0, NULL }
 };
 
+static int lnetctl_list_commands(int argc, char **argv)
+{
+       char buffer[81] = ""; /* 80 printable chars + terminating NUL */
+
+       Parser_list_commands(list, buffer, sizeof(buffer), NULL, 0, 4);
+
+       return 0;
+}
+
 int main(int argc, char **argv)
 {
        int rc = 0;