net/i40e: fix Tx queue info get

[dpdk.git] / test / test / test_eal_flags.c

diff --git a/test/test/test_eal_flags.c b/test/test/test_eal_flags.c
index 310109e..f840ca5 100644 (file)
--- a/test/test/test_eal_flags.c
+++ b/test/test/test_eal_flags.c
@@ -1,36 +1,8 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   Copyright(c) 2014 6WIND S.A.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation.
+ * Copyright(c) 2014 6WIND S.A.
  */
+
 #include <stdio.h>
 
 #include "test.h"
@@ -61,7 +33,7 @@
 #define memtest "memtest"
 #define memtest1 "memtest1"
 #define memtest2 "memtest2"
-#define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 10)
+#define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 20)
 #define launch_proc(ARGV) process_dup(ARGV, \
                sizeof(ARGV)/(sizeof(ARGV[0])), __func__)
 
@@ -1166,10 +1138,11 @@ test_memory_flags(void)
 #ifdef RTE_EXEC_ENV_BSDAPP
        int i, num_sockets = 1;
 #else
-       int i, num_sockets = get_number_of_sockets();
+       int i, num_sockets = RTE_MIN(get_number_of_sockets(),
+                       RTE_MAX_NUMA_NODES);
 #endif
 
-       if (num_sockets <= 0 || num_sockets > RTE_MAX_NUMA_NODES) {
+       if (num_sockets <= 0) {
                printf("Error - cannot get number of sockets!\n");
                return -1;
        }
@@ -1179,11 +1152,12 @@ test_memory_flags(void)
        /* add one extra socket */
        for (i = 0; i < num_sockets + 1; i++) {
                snprintf(buf, sizeof(buf), "%s%s", invalid_socket_mem, DEFAULT_MEM_SIZE);
-               snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
+               strlcpy(invalid_socket_mem, buf, sizeof(invalid_socket_mem));
 
                if (num_sockets + 1 - i > 1) {
                        snprintf(buf, sizeof(buf), "%s,", invalid_socket_mem);
-                       snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
+                       strlcpy(invalid_socket_mem, buf,
+                               sizeof(invalid_socket_mem));
                }
        }
 
@@ -1195,11 +1169,12 @@ test_memory_flags(void)
        /* add one extra socket */
        for (i = 0; i < num_sockets; i++) {
                snprintf(buf, sizeof(buf), "%s%s", valid_socket_mem, DEFAULT_MEM_SIZE);
-               snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
+               strlcpy(valid_socket_mem, buf, sizeof(valid_socket_mem));
 
                if (num_sockets - i > 1) {
                        snprintf(buf, sizeof(buf), "%s,", valid_socket_mem);
-                       snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
+                       strlcpy(valid_socket_mem, buf,
+                               sizeof(valid_socket_mem));
                }
        }