From 70fdad9a893b3913ee0c0bc86bbeafde8d19fbc3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 19 Oct 2018 04:28:31 -0400 Subject: [PATCH] Remove some unused FlatpakDir functions Closes: #2252 Approved by: matthiasclasen --- common/flatpak-dir-private.h | 6 ------ common/flatpak-dir.c | 39 ------------------------------------ 2 files changed, 45 deletions(-) diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h index b4e3b730..bbb7560e 100644 --- a/common/flatpak-dir-private.h +++ b/common/flatpak-dir-private.h @@ -285,10 +285,6 @@ char * flatpak_dir_get_origin (FlatpakDir *self, const char *ref, GCancellable *cancellable, GError **error); -char ** flatpak_dir_get_subpaths (FlatpakDir *self, - const char *ref, - GCancellable *cancellable, - GError **error); GFile * flatpak_dir_get_exports_dir (FlatpakDir *self); GFile * flatpak_dir_get_removed_dir (FlatpakDir *self); GFile * flatpak_dir_get_if_deployed (FlatpakDir *self, @@ -667,8 +663,6 @@ char *flatpak_dir_get_remote_title (FlatpakDir *self, const char *remote_name); char *flatpak_dir_get_remote_collection_id (FlatpakDir *self, const char *remote_name); -char *flatpak_dir_get_remote_main_ref (FlatpakDir *self, - const char *remote_name); gboolean flatpak_dir_get_remote_oci (FlatpakDir *self, const char *remote_name); char *flatpak_dir_get_remote_default_branch (FlatpakDir *self, diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 5430dd07..8b477f4c 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -2175,32 +2175,6 @@ flatpak_dir_get_origin (FlatpakDir *self, return g_strdup (flatpak_deploy_data_get_origin (deploy_data)); } -char ** -flatpak_dir_get_subpaths (FlatpakDir *self, - const char *ref, - GCancellable *cancellable, - GError **error) -{ - g_autoptr(GVariant) deploy_data = NULL; - char **subpaths; - int i; - - deploy_data = flatpak_dir_get_deploy_data (self, ref, - cancellable, error); - if (deploy_data == NULL) - { - g_set_error (error, FLATPAK_ERROR, FLATPAK_ERROR_NOT_INSTALLED, - _("%s not installed"), ref); - return NULL; - } - - subpaths = (char **) flatpak_deploy_data_get_subpaths (deploy_data); - for (i = 0; subpaths[i] != NULL; i++) - subpaths[i] = g_strdup (subpaths[i]); - - return subpaths; -} - gboolean flatpak_dir_ensure_path (FlatpakDir *self, GCancellable *cancellable, @@ -10424,19 +10398,6 @@ flatpak_dir_get_remote_oci (FlatpakDir *self, return url && g_str_has_prefix (url, "oci+"); } -char * -flatpak_dir_get_remote_main_ref (FlatpakDir *self, - const char *remote_name) -{ - GKeyFile *config = ostree_repo_get_config (self->repo); - g_autofree char *group = get_group (remote_name); - - if (config) - return g_key_file_get_string (config, group, "xa.main-ref", NULL); - - return NULL; -} - char * flatpak_dir_get_remote_default_branch (FlatpakDir *self, const char *remote_name)