Changeset 552da22 for protocols/jabber

Timestamp:

2023-04-01T20:29:42Z (21 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@…>

Location:

protocols/jabber

Files:

• io.c (modified) (2 diffs)
• jabber.c (modified) (1 diff)

protocols/jabber/io.c

@@ -63 +63 @@
                 /* If the queue is empty, allocate a new buffer. */
                 jd->tx_len = len;
-                jd->txq = g_memdup(buf, len);
+                jd->txq = g_memdup2(buf, len);
 
                 /* Try if we can write it immediately so we don't have to do
@@ -134 +134 @@
                 char *s;
 
-                s = g_memdup(jd->txq + st, jd->tx_len - st);
+                s = g_memdup2(jd->txq + st, jd->tx_len - st);
                 jd->tx_len -= st;
                 g_free(jd->txq);

protocols/jabber/jabber.c

@@ -803 +803 @@
 
         /* Another one for hipchat, which has completely different logins */
-        hipchat = g_memdup(ret, sizeof(struct prpl));
+        hipchat = g_memdup2(ret, sizeof(struct prpl));
         hipchat->name = "hipchat";
         register_protocol(hipchat);