Changeset 552da22 for lib/json_util.c

Timestamp:

2023-04-01T20:29:42Z (13 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

10425b2

Parents:

a4ac9c4

git-author:

David Cantrell <dcantrell@…> (01-04-23 20:29:42)

git-committer:

GitHub <noreply@…> (01-04-23 20:29:42)

Message:

Use g_memdup2() with glib versions >= 2.68.0 (#168)

• Use g_memdup2() with glib versions >= 2.68.0

g_memdup() was deprecated in glib 2.68.0. The new function is
g_memdup2(). Still support building with older versions of glib via
macros.

Signed-off-by: David Cantrell <dcantrell@…>

• Fall back to g_memdup when g_memdup2 is not available, rather than defining custom macro

---

Signed-off-by: David Cantrell <dcantrell@…>
Co-authored-by: Jelmer Vernooij <jelmer@…>

File:

• lib/json_util.c (modified) (2 diffs)

lib/json_util.c

@@ -27 +27 @@
 
 #include "json_util.h"
+
+/* g_memdup() deprecated as of glib 2.68.0 */
+#ifdef GLIB_VERSION_2_68
+#define g_memdup2 g_memdup2
+#else
+#define g_memdup2 g_memdup
+#endif
 
 json_value *json_o_get(const json_value *obj, const json_char *name)
@@ -61 +68 @@
 
         if (ret && ret->type == json_string && ret->u.string.ptr) {
-                return g_memdup(ret->u.string.ptr, ret->u.string.length + 1);
+                return g_memdup2(ret->u.string.ptr, ret->u.string.length + 1);
         } else {
                 return NULL;