From 584efdd4c0988e1a495966635bc29b6bca762ce5 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Mon, 14 Dec 2020 17:27:56 +0000 Subject: [PATCH] flatpak-context: #if 0 an entire function instead of editing its content This makes it a bit easier to reason about what we do and don't need. Signed-off-by: Simon McVittie <smcv@collabora.com> --- pressure-vessel/flatpak-context-private.h | 2 ++ pressure-vessel/flatpak-context.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pressure-vessel/flatpak-context-private.h b/pressure-vessel/flatpak-context-private.h index 2773c979b..f932f6a0b 100644 --- a/pressure-vessel/flatpak-context-private.h +++ b/pressure-vessel/flatpak-context-private.h @@ -151,12 +151,14 @@ FlatpakContext *flatpak_context_load_for_deploy (FlatpakDeploy *deploy, FlatpakExports *flatpak_context_get_exports (FlatpakContext *context, const char *app_id); +#if 0 void flatpak_context_append_bwrap_filesystem (FlatpakContext *context, FlatpakBwrap *bwrap, const char *app_id, GFile *app_id_dir, GPtrArray *extra_app_id_dirs, FlatpakExports **exports_out); +#endif G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakContext, flatpak_context_free) diff --git a/pressure-vessel/flatpak-context.c b/pressure-vessel/flatpak-context.c index 892301fe0..895de1a78 100644 --- a/pressure-vessel/flatpak-context.c +++ b/pressure-vessel/flatpak-context.c @@ -553,6 +553,7 @@ get_xdg_dir_from_prefix (const char *prefix, return FALSE; } +#if 0 /* This looks only in the xdg dirs (config, cache, data), not the user definable ones */ static char * @@ -587,6 +588,7 @@ get_xdg_dir_from_string (const char *filesystem, return NULL; } +#endif static gboolean get_xdg_user_dir_from_string (const char *filesystem, @@ -2350,6 +2352,7 @@ flatpak_context_get_run_flags (FlatpakContext *context) return flags; } +#if 0 void flatpak_context_append_bwrap_filesystem (FlatpakContext *context, FlatpakBwrap *bwrap, @@ -2360,9 +2363,7 @@ flatpak_context_append_bwrap_filesystem (FlatpakContext *context, { g_autoptr(FlatpakExports) exports = flatpak_exports_new (); g_autoptr(GString) xdg_dirs_conf = g_string_new (""); -#if 0 g_autoptr(GFile) user_flatpak_dir = NULL; -#endif gboolean home_access = FALSE; GHashTableIter iter; gpointer key, value; @@ -2404,11 +2405,9 @@ flatpak_context_append_bwrap_filesystem (FlatpakContext *context, NULL); } -#if 0 /* Hide the flatpak dir by default (unless explicitly made visible) */ user_flatpak_dir = flatpak_get_user_base_dir_location (); flatpak_exports_add_path_tmpfs (exports, flatpak_file_get_path_cached (user_flatpak_dir)); -#endif /* Ensure we always have a homedir */ flatpak_exports_add_path_dir (exports, g_get_home_dir ()); @@ -2475,3 +2474,4 @@ flatpak_context_append_bwrap_filesystem (FlatpakContext *context, if (exports_out) *exports_out = g_steal_pointer (&exports); } +#endif -- GitLab