ctl/timer/seq: optimization for GLib v2.68

The usage of g_memdup() is deprecated since glib 2.68 because it has
narrow integer conversion from gsize to guint.

This commit replaces the usage with macro for g_memdup2().

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/src/ctl/elem-id.c b/src/ctl/elem-id.c
index fa3a810239254d944943212a822dffe1b63b5e63..9c77dac7d79f678f85b86ddcc766713d135f97cb 100644 (file)
--- a/src/ctl/elem-id.c
+++ b/src/ctl/elem-id.c
@@ -15,7 +15,15 @@
  */
 ALSACtlElemId *ctl_elem_id_copy(const ALSACtlElemId *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSACtlElemId, alsactl_elem_id, ctl_elem_id_copy, g_free);

diff --git a/src/seq/addr.c b/src/seq/addr.c
index a4d7d06b33c610815ea804f361abd135d00edb56..f169b55b28d66b10008a6589c5de2f887a62dfa0 100644 (file)
--- a/src/seq/addr.c
+++ b/src/seq/addr.c
@@ -13,7 +13,15 @@
  */
 ALSASeqAddr *seq_addr_copy(const ALSASeqAddr *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSASeqAddr, alsaseq_addr, seq_addr_copy, g_free)

diff --git a/src/seq/event-data-connect.c b/src/seq/event-data-connect.c
index 397c52f19c428abf51258938faf9261e14ce1508..5901c18169eedfb954275ad1ed84a639580c806f 100644 (file)
--- a/src/seq/event-data-connect.c
+++ b/src/seq/event-data-connect.c
@@ -13,7 +13,15 @@
  */
 ALSASeqEventDataConnect *seq_event_data_connect_copy(const ALSASeqEventDataConnect *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSASeqEventDataConnect, alsaseq_event_data_connect, seq_event_data_connect_copy, g_free)

diff --git a/src/seq/event-data-ctl.c b/src/seq/event-data-ctl.c
index 074ce84b28b4f0677154d632e5a39b5f5f43d5e6..63ea2c6bf376e23e85688033444d42e42db4e2ae 100644 (file)
--- a/src/seq/event-data-ctl.c
+++ b/src/seq/event-data-ctl.c
@@ -13,7 +13,15 @@
  */
 ALSASeqEventDataCtl *seq_event_data_ctl_copy(const ALSASeqEventDataCtl *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSASeqEventDataCtl, alsaseq_event_data_ctl, seq_event_data_ctl_copy, g_free)

diff --git a/src/seq/event-data-note.c b/src/seq/event-data-note.c
index cfd5e4abfd99d6bf04c83d28f0246e730d013482..da906e0629ef45ed2e8bef12896ab3efefcd0ba3 100644 (file)
--- a/src/seq/event-data-note.c
+++ b/src/seq/event-data-note.c
@@ -13,7 +13,15 @@
  */
 ALSASeqEventDataNote *seq_event_data_note_copy(const ALSASeqEventDataNote *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSASeqEventDataNote, alsaseq_event_data_note, seq_event_data_note_copy, g_free)

diff --git a/src/seq/event-data-queue.c b/src/seq/event-data-queue.c
index 0cbd79494f80d26458ec88101cfad991d5977651..b115d17544d2c7b13e0a27de376566d54d1e3864 100644 (file)
--- a/src/seq/event-data-queue.c
+++ b/src/seq/event-data-queue.c
@@ -14,7 +14,15 @@
  */
 ALSASeqEventDataQueue *seq_event_data_queue_copy(const ALSASeqEventDataQueue *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSASeqEventDataQueue, alsaseq_event_data_queue, seq_event_data_queue_copy, g_free)

diff --git a/src/seq/event-data-result.c b/src/seq/event-data-result.c
index 1390b2fd0b806de4dae25d320c82e7440ecde9f5..0339da928b4708318ea7180820803a7dc8339632 100644 (file)
--- a/src/seq/event-data-result.c
+++ b/src/seq/event-data-result.c
@@ -13,7 +13,15 @@
  */
 ALSASeqEventDataResult *seq_event_data_result_copy(const ALSASeqEventDataResult *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSASeqEventDataResult, alsaseq_event_data_result, seq_event_data_result_copy, g_free)

diff --git a/src/seq/queue-timer-data-alsa.c b/src/seq/queue-timer-data-alsa.c
index 2c48de0cfc038d8cf497b328f6be7c14e3524225..54f032666834711dc2bd09ab106919ede33a0fdb 100644 (file)
--- a/src/seq/queue-timer-data-alsa.c
+++ b/src/seq/queue-timer-data-alsa.c
@@ -13,7 +13,15 @@
  */
 ALSASeqQueueTimerDataAlsa *seq_queue_timer_data_alsa_copy(const ALSASeqQueueTimerDataAlsa *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSASeqQueueTimerDataAlsa, alsaseq_queue_timer_data_alsa, seq_queue_timer_data_alsa_copy, g_free)

diff --git a/src/seq/remove-filter.c b/src/seq/remove-filter.c
index 91726396a62e4ac4df7f0ed6c57f90789a7c9951..e0576de0830eb1353be9ad4948036234b64063c0 100644 (file)
--- a/src/seq/remove-filter.c
+++ b/src/seq/remove-filter.c
@@ -20,7 +20,15 @@
  */
 ALSASeqRemoveFilter *seq_remove_filter_copy(const ALSASeqRemoveFilter *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSASeqRemoveFilter, alsaseq_remove_filter, seq_remove_filter_copy, g_free)

diff --git a/src/seq/tstamp.c b/src/seq/tstamp.c
index 2191905e6bac12d7a81c29907107fb66e1bc98e7..8ab632ab6479e346e1afecfc57556829fa5cd002 100644 (file)
--- a/src/seq/tstamp.c
+++ b/src/seq/tstamp.c
@@ -13,7 +13,15 @@
  */
 ALSASeqTstamp *seq_tstamp_copy(const ALSASeqTstamp *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSASeqTstamp, alsaseq_tstamp, seq_tstamp_copy, g_free)

diff --git a/src/timer/device-id.c b/src/timer/device-id.c
index 1f0dc43b35d82ed87c8afb96ff3dcbdcfce635e5..069379a9490b6305aaefceaad7ce46efd42e9f79 100644 (file)
--- a/src/timer/device-id.c
+++ b/src/timer/device-id.c
@@ -16,7 +16,15 @@
  */
 ALSATimerDeviceId *timer_device_id_copy(const ALSATimerDeviceId *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSATimerDeviceId, alsatimer_device_id, timer_device_id_copy, g_free)

diff --git a/src/timer/event-data-tick.c b/src/timer/event-data-tick.c
index 8d6ceabe77efe1655a93e166e198d105defa1fe9..4bff582e801d41296f160883dad46a3726fa08ad 100644 (file)
--- a/src/timer/event-data-tick.c
+++ b/src/timer/event-data-tick.c
@@ -15,7 +15,15 @@
  */
 ALSATimerEventDataTick *timer_event_data_tick_copy(const ALSATimerEventDataTick *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSATimerEventDataTick, alsatimer_event_data_tick, timer_event_data_tick_copy, g_free)

diff --git a/src/timer/event-data-tstamp.c b/src/timer/event-data-tstamp.c
index 85417d441743a0467ba150d3f15dae7a46bfcc66..1eada5d000001b18005b78bfbbf77fce3fe668fb 100644 (file)
--- a/src/timer/event-data-tstamp.c
+++ b/src/timer/event-data-tstamp.c
@@ -15,7 +15,15 @@
  */
 ALSATimerEventDataTstamp *timer_event_data_tstamp_copy(const ALSATimerEventDataTstamp *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSATimerEventDataTstamp, alsatimer_event_data_tstamp, timer_event_data_tstamp_copy, g_free)

diff --git a/src/timer/event.c b/src/timer/event.c
index 1a8c1698bed795e94ba9f9fa786d01c432b72ab4..f77ec9cc9dde27177e55e833cb7ddfa57535c069 100644 (file)
--- a/src/timer/event.c
+++ b/src/timer/event.c
@@ -14,7 +14,15 @@
  */
 ALSATimerEvent *timer_event_copy(const ALSATimerEvent *self)
 {
-    return g_memdup(self, sizeof(*self));
+#ifdef g_memdup2
+    return g_memdup2(self, sizeof(*self));
+#else
+    // GLib v2.68 deprecated g_memdup() with concern about overflow by narrow conversion from size_t to
+    // unsigned int however it's safe in the local case.
+    gpointer ptr = g_malloc(sizeof(*self));
+    memcpy(ptr, self, sizeof(*self));
+    return ptr;
+#endif
 }
 
 G_DEFINE_BOXED_TYPE(ALSATimerEvent, alsatimer_event, timer_event_copy, g_free)