From bd36701d986988a4584309024e7947e04d6db4fd Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Mon, 4 Nov 2019 18:26:16 +0000 Subject: [PATCH] _srt_get_helpers_path: Rename global variable This gets it out of the way of a future function that takes a helpers_path argument. Signed-off-by: Simon McVittie <smcv@collabora.com> --- steam-runtime-tools/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/steam-runtime-tools/utils.c b/steam-runtime-tools/utils.c index 048e72933..8a7057580 100644 --- a/steam-runtime-tools/utils.c +++ b/steam-runtime-tools/utils.c @@ -145,7 +145,7 @@ _srt_check_not_setuid (void) return !is_setuid; } -static gchar *helpers_path = NULL; +static gchar *global_helpers_path = NULL; G_GNUC_INTERNAL const char * _srt_get_helpers_path (GError **error) @@ -158,7 +158,7 @@ _srt_get_helpers_path (GError **error) g_return_val_if_fail (_srt_check_not_setuid (), NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); - path = helpers_path; + path = global_helpers_path; if (path != NULL) goto out; @@ -198,10 +198,10 @@ _srt_get_helpers_path (GError **error) } /* deliberate one-per-process leak */ - helpers_path = g_build_filename ( + global_helpers_path = g_build_filename ( dir, "libexec", "steam-runtime-tools-" _SRT_API_MAJOR, NULL); - path = helpers_path; + path = global_helpers_path; g_free (dir); -- GitLab