diff options
| author | Kalev Lember <klember@redhat.com> | 2015-09-08 14:30:28 +0200 |
|---|---|---|
| committer | Kalev Lember <klember@redhat.com> | 2015-09-08 14:32:23 +0200 |
| commit | 6ef00b04680e3bfb8923158f7ffef3de8d9b09ef (patch) | |
| tree | 0b21f7b95bc27223621ae657c2b04f20b78df877 /libappstream-builder/asb-package-deb.c | |
| parent | a3d06c5cb6f85e963be74e8866e1c3bc71ee4990 (diff) | |
| download | appstream-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-deb.c')
| -rw-r--r-- | libappstream-builder/asb-package-deb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libappstream-builder/asb-package-deb.c b/libappstream-builder/asb-package-deb.c index 3b2f516..4565d3b 100644 --- a/libappstream-builder/asb-package-deb.c +++ b/libappstream-builder/asb-package-deb.c @@ -55,8 +55,8 @@ asb_package_deb_ensure_simple (AsbPackage *pkg, GError **error) gchar **vr; guint i; guint j; - _cleanup_free_ gchar *output = NULL; - _cleanup_strv_free_ gchar **lines = NULL; + g_autofree gchar *output = NULL; + g_auto(GStrv) lines = NULL; /* spawn sync */ argv[2] = asb_package_get_filename (pkg); @@ -115,9 +115,9 @@ asb_package_deb_ensure_filelists (AsbPackage *pkg, GError **error) const gchar *argv[4] = { "dpkg", "--contents", "fn", NULL }; const gchar *fn; 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); @@ -184,7 +184,7 @@ asb_package_deb_explode (AsbPackage *pkg, /* then decompress the data file */ for (i = 0; data_names[i] != NULL; i++) { - _cleanup_free_ gchar *data_fn = NULL; + g_autofree gchar *data_fn = NULL; data_fn = g_build_filename (dir, data_names[i], NULL); if (g_file_test (data_fn, G_FILE_TEST_EXISTS)) { if (!asb_utils_explode (data_fn, dir, glob, error)) |