mirror/flatpak
1
0 Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-10-22 15:45:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

lib: Return GBytes from xdg_app_installed_ref_load_metadata()

Browse Source 
This is an ABI break, but nothing uses this yet.
This commit is contained in:
Alexander Larsson committed 2016-02-16 16:11:01 +01:00
1 parent faecde5da5
commit ac851cae9e
3 files changed
+6 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/test-lib.c
+1 -1
View File
@@ -166,7 +166,7 @@ main (int argc, char *argv[])
xdg_app_installed_ref_get_deploy_dir (app),
xdg_app_installed_ref_get_is_current (app),
xdg_app_installed_ref_get_installed_size (app));
g_print ("metadata:\n%s\n", xdg_app_installed_ref_load_metadata (app, NULL, NULL));
g_print ("metadata:\n%s\n", (char *)g_bytes_get_data (xdg_app_installed_ref_load_metadata (app, NULL, NULL), NULL));
}
}
lib/xdg-app-installed-ref.c
+4 -3
View File
@@ -229,7 +229,7 @@ xdg_app_installed_ref_get_installed_size (XdgAppInstalledRef *self)
return priv->installed_size;
}
char *
GBytes *
xdg_app_installed_ref_load_metadata (XdgAppInstalledRef *self,
GCancellable *cancellable,
GError **error)
@@ -237,6 +237,7 @@ xdg_app_installed_ref_load_metadata (XdgAppInstalledRef *self,
XdgAppInstalledRefPrivate *priv = xdg_app_installed_ref_get_instance_private (self);
g_autofree char *path = NULL;
char *metadata;
gsize length;
if (priv->deploy_dir == NULL)
{
@@ -246,10 +247,10 @@ xdg_app_installed_ref_load_metadata (XdgAppInstalledRef *self,
}
path = g_build_filename (priv->deploy_dir, "metadata", NULL);
if (!g_file_get_contents (path, &metadata, NULL, error))
if (!g_file_get_contents (path, &metadata, &length, error))
return NULL;
return metadata;
return g_bytes_new_take (metadata, length);
}
XdgAppInstalledRef *
lib/xdg-app-installed-ref.h
+1 -1
View File
@@ -53,7 +53,7 @@ XDG_APP_EXTERN guint64 xdg_app_installed_ref_get_installed_size (XdgAppInsta
XDG_APP_EXTERN const char *xdg_app_installed_ref_get_deploy_dir (XdgAppInstalledRef *self);
XDG_APP_EXTERN const char *xdg_app_installed_ref_get_latest_commit (XdgAppInstalledRef *self);
XDG_APP_EXTERN gboolean xdg_app_installed_ref_get_is_current (XdgAppInstalledRef *self);
XDG_APP_EXTERN char *xdg_app_installed_ref_load_metadata (XdgAppInstalledRef *self,
XDG_APP_EXTERN GBytes *xdg_app_installed_ref_load_metadata (XdgAppInstalledRef *self,
GCancellable *cancellable,
GError **error);