treewide: Replace g_memdup with g_memdup2

17 files changed, 25 insertions, 25 deletions

diff --git a/drivers/hsomodem/gprs-context.c b/drivers/hsomodem/gprs-context.c
index ca622480..44dc89ae 100644
--- a/drivers/hsomodem/gprs-context.c
+++ b/drivers/hsomodem/gprs-context.c
@@ -128,7 +128,7 @@ static void hso_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		return;
 	}
 
-	ncbd = g_memdup(cbd, sizeof(struct cb_data));
+	ncbd = g_memdup2(cbd, sizeof(struct cb_data));
 
 	snprintf(buf, sizeof(buf), "AT_OWANCALL=%u,1,1", gcd->active_context);
 
diff --git a/drivers/huaweimodem/gprs-context.c b/drivers/huaweimodem/gprs-context.c
index de07b055..2a1a828c 100644
--- a/drivers/huaweimodem/gprs-context.c
+++ b/drivers/huaweimodem/gprs-context.c
@@ -234,7 +234,7 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		return;
 	}
 
-	ncbd = g_memdup(cbd, sizeof(struct cb_data));
+	ncbd = g_memdup2(cbd, sizeof(struct cb_data));
 
 	snprintf(buf, sizeof(buf), "AT^NDISDUP=%u,1", gcd->active_context);
 
diff --git a/drivers/iceramodem/gprs-context.c b/drivers/iceramodem/gprs-context.c
index 41d9d9bf..21b748a0 100644
--- a/drivers/iceramodem/gprs-context.c
+++ b/drivers/iceramodem/gprs-context.c
@@ -284,7 +284,7 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	if (g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL) == 0)
 		goto error;
 
-	ncbd = g_memdup(cbd, sizeof(struct cb_data));
+	ncbd = g_memdup2(cbd, sizeof(struct cb_data));
 
 	snprintf(buf, sizeof(buf), "AT%%IPDPACT=%u,1", gcd->active_context);
 
diff --git a/drivers/mbmmodem/gprs-context.c b/drivers/mbmmodem/gprs-context.c
index f873e283..acfa2115 100644
--- a/drivers/mbmmodem/gprs-context.c
+++ b/drivers/mbmmodem/gprs-context.c
@@ -345,7 +345,7 @@ static void mbm_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		return;
 	}
 
-	ncbd = g_memdup(cbd, sizeof(struct cb_data));
+	ncbd = g_memdup2(cbd, sizeof(struct cb_data));
 
 	snprintf(buf, sizeof(buf), "AT*ENAP=1,%u", gcd->active_context);
 
diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
index c2284806..e1b51dc0 100644
--- a/drivers/stemodem/gprs-context.c
+++ b/drivers/stemodem/gprs-context.c
@@ -260,7 +260,7 @@ static void ste_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	snprintf(buf, sizeof(buf), "AT*EPPSD=1,%x,%u",
 			gcd->channel_id, gcd->active_context);
 
-	ncbd = g_memdup(cbd, sizeof(struct cb_data));
+	ncbd = g_memdup2(cbd, sizeof(struct cb_data));
 
 	if (g_at_chat_send(gcd->chat, buf, NULL,
 				ste_eppsd_up_cb, ncbd, g_free) > 0)
diff --git a/drivers/swmodem/gprs-context.c b/drivers/swmodem/gprs-context.c
index 002053cf..6532aa4b 100644
--- a/drivers/swmodem/gprs-context.c
+++ b/drivers/swmodem/gprs-context.c
@@ -132,7 +132,7 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
 		return;
 	}
 
-	ncbd = g_memdup(cbd, sizeof(struct cb_data));
+	ncbd = g_memdup2(cbd, sizeof(struct cb_data));
 
 	snprintf(buf, sizeof(buf), "AT!SCACT=1,%u", gcd->active_context);
 
diff --git a/gatchat/gatmux.c b/gatchat/gatmux.c
index 4d89f039..2e4ce9fe 100644
--- a/gatchat/gatmux.c
+++ b/gatchat/gatmux.c
@@ -908,7 +908,7 @@ static void mux_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	} else
 		goto error;
 
-	nmsd = g_memdup(msd, sizeof(struct mux_setup_data));
+	nmsd = g_memdup2(msd, sizeof(struct mux_setup_data));
 	g_at_chat_ref(nmsd->chat);
 
 	if (speed < 0)
diff --git a/gatchat/ppp_ipcp.c b/gatchat/ppp_ipcp.c
index 125a5429..4d19e1b8 100644
--- a/gatchat/ppp_ipcp.c
+++ b/gatchat/ppp_ipcp.c
@@ -371,7 +371,7 @@ static enum rcr_result ipcp_server_rcr(struct ipcp_data *ipcp,
 
 	if (len > 0) {
 		*new_len = len;
-		*new_options = g_memdup(nak_options, len);
+		*new_options = g_memdup2(nak_options, len);
 
 		return RCR_NAK;
 	}
diff --git a/gatchat/ppp_ipv6cp.c b/gatchat/ppp_ipv6cp.c
index 94feaccd..ac2b7587 100644
--- a/gatchat/ppp_ipv6cp.c
+++ b/gatchat/ppp_ipv6cp.c
@@ -160,7 +160,7 @@ static enum rcr_result ipv6cp_server_rcr(struct ipv6cp_data *ipv6cp,
 
 	if (len > 0) {
 		*new_len = len;
-		*new_options = g_memdup(nak_options, len);
+		*new_options = g_memdup2(nak_options, len);
 
 		return RCR_NAK;
 	}
diff --git a/src/modem.c b/src/modem.c
index 52988cf3..bd4c1049 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -1754,10 +1754,10 @@ static int set_modem_property(struct ofono_modem *modem, const char *name,
 		property->value = g_strdup((const char *) value);
 		break;
 	case PROPERTY_TYPE_INTEGER:
-		property->value = g_memdup(value, sizeof(int));
+		property->value = g_memdup2(value, sizeof(int));
 		break;
 	case PROPERTY_TYPE_BOOLEAN:
-		property->value = g_memdup(value, sizeof(ofono_bool_t));
+		property->value = g_memdup2(value, sizeof(ofono_bool_t));
 		break;
 	default:
 		break;
diff --git a/src/network.c b/src/network.c
index 2824eae6..0d54bb35 100644
--- a/src/network.c
+++ b/src/network.c
@@ -733,7 +733,7 @@ static gboolean update_operator_list(struct ofono_netreg *netreg, int total,
 			/* New operator */
 			struct network_operator_data *opd;
 
-			opd = g_memdup(copd,
+			opd = g_memdup2(copd,
 					sizeof(struct network_operator_data));
 
 			if (!network_operator_dbus_register(netreg, opd)) {
diff --git a/src/sim.c b/src/sim.c
index 793ff64a..e150c962 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -1182,7 +1182,7 @@ static void sim_iidf_read_cb(int ok, int length, int record,
 		clut_len = data[3] * 3;
 
 	iidf_id = efimg[3] << 8 | efimg[4];
-	sim->iidf_image = g_memdup(data, length);
+	sim->iidf_image = g_memdup2(data, length);
 
 	/* The path it the same between 2G and 3G */
 	path_len = sim_ef_db_get_path_3g(SIM_EFIMG_FILEID, path);
@@ -1925,7 +1925,7 @@ static void sim_efsst_read_cb(int ok, int length, int record,
 		goto out;
 	}
 
-	sim->efsst = g_memdup(data, length);
+	sim->efsst = g_memdup2(data, length);
 	sim->efsst_length = length;
 
 	/*
@@ -1964,7 +1964,7 @@ static void sim_efest_read_cb(int ok, int length, int record,
 		goto out;
 	}
 
-	sim->efest = g_memdup(data, length);
+	sim->efest = g_memdup2(data, length);
 	sim->efest_length = length;
 
 	/*
@@ -2008,7 +2008,7 @@ static void sim_efust_read_cb(int ok, int length, int record,
 		goto out;
 	}
 
-	sim->efust = g_memdup(data, length);
+	sim->efust = g_memdup2(data, length);
 	sim->efust_length = length;
 
 	/*
@@ -2151,7 +2151,7 @@ static void sim_efli_read_cb(int ok, int length, int record,
 	if (!ok)
 		return;
 
-	sim->efli = g_memdup(data, length);
+	sim->efli = g_memdup2(data, length);
 	sim->efli_length = length;
 }
 
diff --git a/src/simfs.c b/src/simfs.c
index a42dee3a..8b838b00 100644
--- a/src/simfs.c
+++ b/src/simfs.c
@@ -1128,7 +1128,7 @@ int sim_fs_write(struct ofono_sim_context *context, int id,
 	op->cb = cb;
 	op->userdata = userdata;
 	op->is_read = FALSE;
-	op->buffer = g_memdup(data, length);
+	op->buffer = g_memdup2(data, length);
 	op->structure = structure;
 	op->length = length;
 	op->current = record;
diff --git a/src/simutil.c b/src/simutil.c
index acb2aa2f..5d2aa6a2 100644
--- a/src/simutil.c
+++ b/src/simutil.c
@@ -1606,7 +1606,7 @@ GSList *sim_parse_app_template_entries(const unsigned char *buffer, int len)
 		} else
 			app.label = NULL;
 
-		ret = g_slist_prepend(ret, g_memdup(&app, sizeof(app)));
+		ret = g_slist_prepend(ret, g_memdup2(&app, sizeof(app)));
 
 		len -= (dataobj - buffer) + dataobj_len;
 		buffer = dataobj + dataobj_len;
diff --git a/src/smsutil.c b/src/smsutil.c
index e6556df6..6911f839 100644
--- a/src/smsutil.c
+++ b/src/smsutil.c
@@ -2814,7 +2814,7 @@ static void sr_assembly_load_backup(GHashTable *assembly_table,
 	}
 
 	/* Node ready, create key and add them to the table */
-	id_table_key = g_memdup(msgid, SMS_MSGID_LEN);
+	id_table_key = g_memdup2(msgid, SMS_MSGID_LEN);
 
 	g_hash_table_insert(id_table, id_table_key, node);
 }
@@ -3129,7 +3129,7 @@ void status_report_assembly_add_fragment(
 
 	/* Create node in the message id hashtable if required */
 	if (node == NULL) {
-		id_table_key = g_memdup(msgid, SMS_MSGID_LEN);
+		id_table_key = g_memdup2(msgid, SMS_MSGID_LEN);
 
 		node = g_new0(struct id_table_node, 1);
 		node->total_mrs = total_mrs;
@@ -3240,7 +3240,7 @@ static GSList *sms_tx_load(const char *imsi, const struct dirent *dir)
 		if (sms_deserialize_outgoing(buf, &s, r) == FALSE)
 			goto free_pdu;
 
-		list = g_slist_prepend(list, g_memdup(&s, sizeof(s)));
+		list = g_slist_prepend(list, g_memdup2(&s, sizeof(s)));
 
 free_pdu:
 		g_free(pdus[len]);
diff --git a/src/voicecall.c b/src/voicecall.c
index 93a92544..6265e4dd 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -2417,7 +2417,7 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
 
 	__ofono_modem_callid_hold(modem, call->id);
 
-	newcall = g_memdup(call, sizeof(struct ofono_call));
+	newcall = g_memdup2(call, sizeof(struct ofono_call));
 	if (newcall == NULL) {
 		ofono_error("Unable to allocate call");
 		goto error;
diff --git a/tools/stktest.c b/tools/stktest.c
index c83d4839..5863bc5e 100644
--- a/tools/stktest.c
+++ b/tools/stktest.c
@@ -3375,9 +3375,9 @@ static void stktest_add_test(const char *name, const char *method,
 
 	test->name = g_strdup(name);
 	test->method = g_strdup(method);
-	test->req_pdu = g_memdup(req, req_len);
+	test->req_pdu = g_memdup2(req, req_len);
 	test->req_len = req_len;
-	test->rsp_pdu = g_memdup(rsp, rsp_len);
+	test->rsp_pdu = g_memdup2(rsp, rsp_len);
 	test->rsp_len = rsp_len;
 	test->agent_func = agent_func;
 	test->tr_func = tr_func;