From: Alejandro Colomar <alx@kernel.org>
Date: Mon, 12 Aug 2024 00:15:18 +0000 (+0200)
Subject: lib/string/memset/: memzero(), strzero(): Return the pointer
X-Git-Tag: 4.17.0-rc1~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dab8de8a72288e89d70d74257923b7b74d808cee;p=thirdparty%2Fshadow.git

lib/string/memset/: memzero(), strzero(): Return the pointer

This allows chaining with free(3) on the same line.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/string/memset/memzero.c b/lib/string/memset/memzero.c
index 74a384b35..0725bd932 100644
--- a/lib/string/memset/memzero.c
+++ b/lib/string/memset/memzero.c
@@ -1,15 +1,13 @@
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
 #include <config.h>
 
-#ident "$Id$"
-
 #include <stddef.h>
 
 #include "string/memset/memzero.h"
 
 
-extern inline void memzero(void *ptr, size_t size);
-extern inline void strzero(char *s);
+extern inline void *memzero(void *ptr, size_t size);
+extern inline char *strzero(char *s);
diff --git a/lib/string/memset/memzero.h b/lib/string/memset/memzero.h
index cbf082cac..d20967b17 100644
--- a/lib/string/memset/memzero.h
+++ b/lib/string/memset/memzero.h
@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2022-2023, Christian Göttsche <cgzones@googlemail.com>
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
@@ -19,11 +19,11 @@
 #define MEMZERO(arr)  memzero(arr, SIZEOF_ARRAY(arr))
 
 
-inline void memzero(void *ptr, size_t size);
-inline void strzero(char *s);
+inline void *memzero(void *ptr, size_t size);
+inline char *strzero(char *s);
 
 
-inline void
+inline void *
 memzero(void *ptr, size_t size)
 {
 #if defined(HAVE_MEMSET_EXPLICIT)
@@ -34,13 +34,14 @@ memzero(void *ptr, size_t size)
 	bzero(ptr, size);
 	__asm__ __volatile__ ("" : : "r"(ptr) : "memory");
 #endif
+	return ptr;
 }
 
 
-inline void
+inline char *
 strzero(char *s)
 {
-	memzero(s, strlen(s));
+	return memzero(s, strlen(s));
 }