examples/ipsec-secgw: support 192/256 AES key sizes

[dpdk.git] / examples / cmdline / commands.c

diff --git a/examples/cmdline/commands.c b/examples/cmdline/commands.c
index 06916d7..0e2232f 100644 (file)
--- a/examples/cmdline/commands.c
+++ b/examples/cmdline/commands.c
@@ -12,12 +12,8 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <termios.h>
-#ifndef __linux__
-       #ifdef __FreeBSD__
-               #include <sys/socket.h>
-       #else
-               #include <net/socket.h>
-       #endif
+#ifdef RTE_EXEC_ENV_FREEBSD
+#include <sys/socket.h>
 #endif
 
 #include <cmdline_rdline.h>
@@ -74,7 +70,7 @@ struct cmd_obj_del_show_result {
 
 static void cmd_obj_del_show_parsed(void *parsed_result,
                                    struct cmdline *cl,
-                                   __attribute__((unused)) void *data)
+                                   __rte_unused void *data)
 {
        struct cmd_obj_del_show_result *res = parsed_result;
        char ip_str[INET6_ADDRSTRLEN];
@@ -126,7 +122,7 @@ struct cmd_obj_add_result {
 
 static void cmd_obj_add_parsed(void *parsed_result,
                               struct cmdline *cl,
-                              __attribute__((unused)) void *data)
+                              __rte_unused void *data)
 {
        struct cmd_obj_add_result *res = parsed_result;
        struct object *o;
@@ -145,7 +141,7 @@ static void cmd_obj_add_parsed(void *parsed_result,
                cmdline_printf(cl, "mem error\n");
                return;
        }
-       snprintf(o->name, sizeof(o->name), "%s", res->name);
+       strlcpy(o->name, res->name, sizeof(o->name));
        o->ip = res->ip;
        SLIST_INSERT_HEAD(&global_obj_list, o, next);
 
@@ -185,9 +181,9 @@ struct cmd_help_result {
        cmdline_fixed_string_t help;
 };
 
-static void cmd_help_parsed(__attribute__((unused)) void *parsed_result,
+static void cmd_help_parsed(__rte_unused void *parsed_result,
                            struct cmdline *cl,
-                           __attribute__((unused)) void *data)
+                           __rte_unused void *data)
 {
        cmdline_printf(cl,
                       "Demo example of command line interface in RTE\n\n"