From eb185287c3c291706b1fd2366e361e17ca13933d Mon Sep 17 00:00:00 2001
From: Matias Elo <matias.elo@nokia.com>
Date: Mon, 6 May 2024 08:39:44 +0300
Subject: Port f15333dba "linux-gen: use _odp_strcpy() instead of strncpy()"

Port original commit from linux-generic.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>
---
 platform/linux-dpdk/odp_queue_basic.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'platform/linux-dpdk/odp_queue_basic.c')

diff --git a/platform/linux-dpdk/odp_queue_basic.c b/platform/linux-dpdk/odp_queue_basic.c
index 4b9dee891..b0b618cd2 100644
--- a/platform/linux-dpdk/odp_queue_basic.c
+++ b/platform/linux-dpdk/odp_queue_basic.c
@@ -32,6 +32,7 @@
 #include <odp_queue_basic_internal.h>
 #include <odp_queue_if.h>
 #include <odp_schedule_if.h>
+#include <odp_string_internal.h>
 #include <odp_timer_internal.h>
 
 #include <inttypes.h>
@@ -1000,12 +1001,11 @@ static int queue_init(queue_entry_t *queue, const char *name,
 
 	queue_type = param->type;
 
-	if (name == NULL) {
+	if (name == NULL)
 		queue->name[0] = 0;
-	} else {
-		strncpy(queue->name, name, ODP_QUEUE_NAME_LEN - 1);
-		queue->name[ODP_QUEUE_NAME_LEN - 1] = 0;
-	}
+	else
+		_odp_strcpy(queue->name, name, ODP_QUEUE_NAME_LEN);
+
 	memcpy(&queue->param, param, sizeof(odp_queue_param_t));
 	if (queue->param.sched.lock_count > _odp_sched_fn->max_ordered_locks())
 		return -1;
-- 
cgit v1.2.3


From 9a3146cb22898cc9b3035352f4c5fccf3370ac83 Mon Sep 17 00:00:00 2001
From: Matias Elo <matias.elo@nokia.com>
Date: Mon, 6 May 2024 09:03:46 +0300
Subject: Port 36019aa2b "linux-gen: update copyright format"

Port original commit from linux-generic.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>
---
 platform/linux-dpdk/odp_queue_basic.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'platform/linux-dpdk/odp_queue_basic.c')

diff --git a/platform/linux-dpdk/odp_queue_basic.c b/platform/linux-dpdk/odp_queue_basic.c
index b0b618cd2..4ee51ee6b 100644
--- a/platform/linux-dpdk/odp_queue_basic.c
+++ b/platform/linux-dpdk/odp_queue_basic.c
@@ -1,8 +1,6 @@
-/* Copyright (c) 2013-2018, Linaro Limited
- * Copyright (c) 2021-2023, Nokia
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2013-2018 Linaro Limited
+ * Copyright (c) 2021-2023 Nokia
  */
 
 #include <odp/api/align.h>
-- 
cgit v1.2.3