package/bluez5_utils: fix build with libglib2 >= 2.69

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>
This commit is contained in:
Thomas Devoogdt 2022-02-06 10:23:57 +01:00 committed by Peter Korsgaard
parent e0d3799b55
commit 572d08ee4a
3 changed files with 1535 additions and 0 deletions

View file

@ -0,0 +1,67 @@
From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Wed, 5 Jan 2022 15:53:35 -0800
Subject: [PATCH] shared/util: Rename btd_malloc to util_malloc
util functions are not limited to daemon only which is normally the case
when using btd prefix.
(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a)
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
---
profiles/audio/avdtp.c | 2 +-
src/shared/util.c | 2 +-
src/shared/util.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index d3dfbf96d..f2b461330 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size,
break;
}
- cpy = btd_malloc(sizeof(*cpy) + cap->length);
+ cpy = util_malloc(sizeof(*cpy) + cap->length);
memcpy(cpy, cap, sizeof(*cap) + cap->length);
size -= sizeof(*cap) + cap->length;
diff --git a/src/shared/util.c b/src/shared/util.c
index 81b20d86f..93110047b 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -25,7 +25,7 @@
#include "src/shared/util.h"
-void *btd_malloc(size_t size)
+void *util_malloc(size_t size)
{
if (__builtin_expect(!!size, 1)) {
void *ptr;
diff --git a/src/shared/util.h b/src/shared/util.h
index ac70117ca..11d09979d 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -75,7 +75,7 @@ do { \
size_t __n = (size_t) (count); \
size_t __s = sizeof(type); \
void *__p; \
- __p = btd_malloc(__n * __s); \
+ __p = util_malloc(__n * __s); \
memset(__p, 0, __n * __s); \
__p; \
}))
@@ -86,7 +86,7 @@ do { \
char *strdelimit(char *str, char *del, char c);
int strsuffix(const char *str, const char *suffix);
-void *btd_malloc(size_t size);
+void *util_malloc(size_t size);
typedef void (*util_debug_func_t)(const char *str, void *user_data);
--
2.17.1

View file

@ -0,0 +1,57 @@
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

File diff suppressed because it is too large Load diff