Changeset 552da22 for protocols

Timestamp:

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

Files:

• bee_user.c (modified) (2 diffs)
• jabber/io.c (modified) (2 diffs)
• jabber/jabber.c (modified) (1 diff)
• purple/ft-direct.c (modified) (1 diff)
• purple/purple.c (modified) (1 diff)
• twitter/twitter.c (modified) (1 diff)
• twitter/twitter_lib.c (modified) (2 diffs)

protocols/bee_user.c

@@ -201 +201 @@
 
         /* May be nice to give the UI something to compare against. */
-        old = g_memdup(bu, sizeof(bee_user_t));
+        old = g_memdup2(bu, sizeof(bee_user_t));
 
         /* TODO(wilmer): OPT_AWAY, or just state == NULL ? */
@@ -239 +239 @@
         }
 
-        old = g_memdup(bu, sizeof(bee_user_t));
+        old = g_memdup2(bu, sizeof(bee_user_t));
 
         bu->status_msg = message && *message ? g_strdup(message) : NULL;

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);

protocols/purple/ft-direct.c

@@ -71 +71 @@
         struct prpl_xfer_data *px = ft->data;
 
-        px->buf = g_memdup(buffer, len);
+        px->buf = g_memdup2(buffer, len);
         px->buf_len = len;
 

protocols/purple/purple.c

@@ -1937 +1937 @@
                 }
 
-                ret = g_memdup(&funcs, sizeof(funcs));
+                ret = g_memdup2(&funcs, sizeof(funcs));
                 ret->name = ret->data = prot->info->id;
                 if (strncmp(ret->name, "prpl-", 5) == 0) {

protocols/twitter/twitter.c

@@ -1117 +1117 @@
 
         /* And an identi.ca variant: */
-        ret = g_memdup(ret, sizeof(struct prpl));
+        ret = g_memdup2(ret, sizeof(struct prpl));
         ret->name = "identica";
         ret->options =  PRPL_OPT_NOOTR;

protocols/twitter/twitter_lib.c

@@ -647 +647 @@
                 }
         } else if (text_value && text_value->type == json_string) {
-                txs->text = g_memdup(text_value->u.string.ptr, text_value->u.string.length + 1);
+                txs->text = g_memdup2(text_value->u.string.ptr, text_value->u.string.length + 1);
                 strip_html(txs->text);
                 expand_entities(&txs->text, node, extended_node);
@@ -674 +674 @@
         JSON_O_FOREACH(node, k, v) {
                 if (strcmp("text", k) == 0 && v->type == json_string) {
-                        txs->text = g_memdup(v->u.string.ptr, v->u.string.length + 1);
+                        txs->text = g_memdup2(v->u.string.ptr, v->u.string.length + 1);
                         strip_html(txs->text);
                 } else if (strcmp("created_at", k) == 0 && v->type == json_string) {