From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 19 May 2021 12:20:49 +0000 (+0900)
Subject: memory-util: make memcpy_safe() return pointer to destination
X-Git-Tag: v249-rc1~196^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1f3b0809855ac199988d369b945556755e3b9b6;p=thirdparty%2Fsystemd.git

memory-util: make memcpy_safe() return pointer to destination
---

diff --git a/src/basic/memory-util.h b/src/basic/memory-util.h
index 179edd247bf..4ca3060c0cc 100644
--- a/src/basic/memory-util.h
+++ b/src/basic/memory-util.h
@@ -16,11 +16,11 @@ size_t page_size(void) _pure_;
 #define PAGE_OFFSET(l) ((l) & (page_size() - 1))
 
 /* Normal memcpy requires src to be nonnull. We do nothing if n is 0. */
-static inline void memcpy_safe(void *dst, const void *src, size_t n) {
+static inline void *memcpy_safe(void *dst, const void *src, size_t n) {
         if (n == 0)
-                return;
+                return dst;
         assert(src);
-        memcpy(dst, src, n);
+        return memcpy(dst, src, n);
 }
 
 /* Normal memcmp requires s1 and s2 to be nonnull. We do nothing if n is 0. */