572d08ee4a
Fix the following build failure raised since bump of libglib2 to version
2.70 in commit 079923d:
profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations]
batt->initial_value = g_memdup(value, length);
Fixes:
- http://autobuild.buildroot.org/results/6b8/6b8870d12e0804d6154230a7322c49416c1dc0e2/build-end.log
Sources:
- https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a
- https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7
- https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
58 lines
1.5 KiB
Diff
58 lines
1.5 KiB
Diff
From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001
|
|
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
|
Date: Thu, 6 Jan 2022 11:45:12 -0800
|
|
Subject: [PATCH] shared/util: Add util_memdup
|
|
|
|
This adds util_memdup which is intended to replace g_memdup since
|
|
replacing that with g_memdup2 requires bumping the glib version.
|
|
|
|
(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7)
|
|
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
|
|
---
|
|
src/shared/util.c | 16 ++++++++++++++++
|
|
src/shared/util.h | 1 +
|
|
2 files changed, 17 insertions(+)
|
|
|
|
diff --git a/src/shared/util.c b/src/shared/util.c
|
|
index 93110047b..6e1c83057 100644
|
|
--- a/src/shared/util.c
|
|
+++ b/src/shared/util.c
|
|
@@ -41,6 +41,22 @@ void *util_malloc(size_t size)
|
|
return NULL;
|
|
}
|
|
|
|
+void *util_memdup(const void *src, size_t size)
|
|
+{
|
|
+ void *cpy;
|
|
+
|
|
+ if (!src || !size)
|
|
+ return NULL;
|
|
+
|
|
+ cpy = util_malloc(size);
|
|
+ if (!cpy)
|
|
+ return NULL;
|
|
+
|
|
+ memcpy(cpy, src, size);
|
|
+
|
|
+ return cpy;
|
|
+}
|
|
+
|
|
void util_debug_va(util_debug_func_t function, void *user_data,
|
|
const char *format, va_list va)
|
|
{
|
|
diff --git a/src/shared/util.h b/src/shared/util.h
|
|
index 11d09979d..8ef6132c4 100644
|
|
--- a/src/shared/util.h
|
|
+++ b/src/shared/util.h
|
|
@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c);
|
|
int strsuffix(const char *str, const char *suffix);
|
|
|
|
void *util_malloc(size_t size);
|
|
+void *util_memdup(const void *src, size_t size);
|
|
|
|
typedef void (*util_debug_func_t)(const char *str, void *user_data);
|
|
|
|
--
|
|
2.17.1
|
|
|