summaryrefslogtreecommitdiff
path: root/libappstream-builder/asb-package-cab.c
diff options
context:
space:
mode:
authorKalev Lember <klember@redhat.com>2015-09-08 14:30:28 +0200
committerKalev Lember <klember@redhat.com>2015-09-08 14:32:23 +0200
commit6ef00b04680e3bfb8923158f7ffef3de8d9b09ef (patch)
tree0b21f7b95bc27223621ae657c2b04f20b78df877 /libappstream-builder/asb-package-cab.c
parenta3d06c5cb6f85e963be74e8866e1c3bc71ee4990 (diff)
downloadappstream-glib-6ef00b04680e3bfb8923158f7ffef3de8d9b09ef.tar.gz
Use GLib's cleanup functions instead of libgsystem's
We still have a few types that don't support g_autoptr(), but very very close to having everything ported over. This also bumps gdk-pixbuf dep to 2.31.5 for the cleanup macro support.
Diffstat (limited to 'libappstream-builder/asb-package-cab.c')
-rw-r--r--libappstream-builder/asb-package-cab.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libappstream-builder/asb-package-cab.c b/libappstream-builder/asb-package-cab.c
index e450291..26b320a 100644
--- a/libappstream-builder/asb-package-cab.c
+++ b/libappstream-builder/asb-package-cab.c
@@ -50,7 +50,7 @@ asb_package_cab_init (AsbPackageCab *pkg)
static gboolean
asb_package_cab_ensure_simple (AsbPackage *pkg, GError **error)
{
- _cleanup_free_ gchar *basename;
+ g_autofree gchar *basename;
gchar *tmp;
/* get basename minus the .cab extension */
@@ -82,9 +82,9 @@ asb_package_cab_ensure_filelists (AsbPackage *pkg, GError **error)
{
const gchar *argv[4] = { "gcab", "--list", "fn", NULL };
guint i;
- _cleanup_free_ gchar *output = NULL;
- _cleanup_ptrarray_unref_ GPtrArray *files = NULL;
- _cleanup_strv_free_ gchar **lines = NULL;
+ g_autofree gchar *output = NULL;
+ g_autoptr(GPtrArray) files = NULL;
+ g_auto(GStrv) lines = NULL;
/* spawn sync */
argv[2] = asb_package_get_filename (pkg);