[glibutil] Added gutil_slice_free() macro

sailfishos · Oct 16, 2020 · b54311d · b54311d
1 parent bb2817d
commit b54311d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 30 deletions.
diff --git a/include/gutil_macros.h b/include/gutil_macros.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2014-2015 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2014-2020 Jolla Ltd.
+ * Copyright (C) 2014-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -13,9 +13,9 @@
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of the Jolla Ltd nor the names of its contributors
- *      may be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -48,6 +48,8 @@
 #  define G_PACKED
 #endif
 
+#define gutil_slice_free(x) g_slice_free1(sizeof(*(x)), x)  /* Since 1.0.49 */
+
 #endif /* GUTIL_MACROS_H */
 
 /*

diff --git a/src/gutil_idlepool.c b/src/gutil_idlepool.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016-2018 Jolla Ltd.
- * Copyright (C) 2016-2018 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2020 Jolla Ltd.
+ * Copyright (C) 2016-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -14,8 +14,8 @@
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
  *   3. Neither the names of the copyright holders nor the names of its
- *      contributors may be used to endorse or promote products derived from
- *      this software without specific prior written permission.
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -31,6 +31,7 @@
  */
 
 #include <gutil_idlepool.h>
+#include <gutil_macros.h>
 #include <gutil_log.h>
 
 #include <glib-object.h>
@@ -103,7 +104,7 @@ gutil_idle_pool_unref(
             /* Clear pointer to the shared instance */
             if (self->shared) *(self->shared) = NULL;
             gutil_idle_pool_drain(self);
-            g_slice_free(GUtilIdlePool, self);
+            gutil_slice_free(self);
         }
     }
 }

diff --git a/src/gutil_idlequeue.c b/src/gutil_idlequeue.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2017 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2017-2020 Jolla Ltd.
+ * Copyright (C) 2017-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -13,9 +13,9 @@
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -31,6 +31,7 @@
  */
 
 #include "gutil_idlequeue.h"
+#include "gutil_macros.h"
 #include "gutil_log.h"
 
 typedef struct gutil_idle_queue_item GUtilIdleQueueItem;
@@ -60,7 +61,7 @@ gutil_idle_queue_item_destroy(
     if (item->destroy) {
         item->destroy(item->data);
     }
-    g_slice_free(GUtilIdleQueueItem, item);
+    gutil_slice_free(item);
 }
 
 static
@@ -151,7 +152,7 @@ gutil_idle_queue_unref(
         GASSERT(q->ref_count > 0);
         if (g_atomic_int_dec_and_test(&q->ref_count)) {
             gutil_idle_queue_cancel_all(q);
-            g_slice_free(GUtilIdleQueue, q);
+            gutil_slice_free(q);
         }
     }
 }

diff --git a/src/gutil_ints.c b/src/gutil_ints.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2017 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2017-2020 Jolla Ltd.
+ * Copyright (C) 2017-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -13,9 +13,9 @@
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -32,6 +32,7 @@
 
 #include "gutil_intarray.h"
 #include "gutil_ints.h"
+#include "gutil_macros.h"
 
 struct gutil_ints {
     const int* data;
@@ -134,7 +135,7 @@ gutil_ints_unref(
             if (ints->free_func) {
                 ints->free_func(ints->user_data);
             }
-            g_slice_free(GUtilInts, ints);
+            gutil_slice_free(ints);
         }
     }
 }
@@ -157,7 +158,7 @@ gutil_ints_unref_to_data(
                 result = g_memdup(ints->data, ints->count * sizeof(int));
                 ints->free_func(ints->user_data);
             }
-            g_slice_free(GUtilInts, ints);
+            gutil_slice_free(ints);
         } else {
             result = g_memdup(ints->data, ints->count * sizeof(int));
         }

diff --git a/src/gutil_ring.c b/src/gutil_ring.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2016 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2016-2020 Jolla Ltd.
+ * Copyright (C) 2016-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -13,9 +13,9 @@
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of the Jolla Ltd nor the names of its contributors
- *      may be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -31,6 +31,7 @@
  */
 
 #include "gutil_ring.h"
+#include "gutil_macros.h"
 #include "gutil_log.h"
 
 struct gutil_ring {
@@ -101,7 +102,7 @@ gutil_ring_unref(
                 }
             }
             g_free(r->data);
-            g_slice_free(GUtilRing, r);
+            gutil_slice_free(r);
         }
     }
 }