File sysprof-libsysprof-ui-avoid-use-of-env.patch of Package sysprof
From a6e3b4ac74ddd856553cc96f3e6c620dc2cabf52 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Mon, 21 Oct 2019 11:35:42 -0700
Subject: [PATCH] libsysprof-ui: avoid use of environ for -Werror=shadow
Fixes #18
---
src/libsysprof-ui/sysprof-profiler-assistant.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/libsysprof-ui/sysprof-profiler-assistant.c b/src/libsysprof-ui/sysprof-profiler-assistant.c
index 22e3e24..c7fcf77 100644
--- a/src/libsysprof-ui/sysprof-profiler-assistant.c
+++ b/src/libsysprof-ui/sysprof-profiler-assistant.c
@@ -235,7 +235,7 @@ sysprof_profiler_assistant_record_clicked_cb (SysprofProfilerAssistant *self,
{
g_auto(GStrv) argv = NULL;
g_auto(GStrv) env = NULL;
- SysprofEnviron *environ;
+ SysprofEnviron *environ_;
const gchar *command;
gint argc;
@@ -245,8 +245,8 @@ sysprof_profiler_assistant_record_clicked_cb (SysprofProfilerAssistant *self,
sysprof_profiler_set_spawn (profiler, TRUE);
sysprof_profiler_set_spawn_argv (profiler, (const gchar * const *)argv);
- environ = sysprof_environ_editor_get_environ (self->environ_editor);
- env = sysprof_environ_get_environ (environ);
+ environ_ = sysprof_environ_editor_get_environ (self->environ_editor);
+ env = sysprof_environ_get_environ (environ_);
sysprof_profiler_set_spawn_env (profiler, (const gchar * const *)env);
sysprof_profiler_set_spawn_inherit_environ (profiler,
@@ -405,7 +405,7 @@ sysprof_profiler_assistant_class_init (SysprofProfilerAssistantClass *klass)
static void
sysprof_profiler_assistant_init (SysprofProfilerAssistant *self)
{
- g_autoptr(SysprofEnviron) environ = sysprof_environ_new ();
+ g_autoptr(SysprofEnviron) environ_ = sysprof_environ_new ();
gtk_widget_init_template (GTK_WIDGET (self));
@@ -445,7 +445,7 @@ sysprof_profiler_assistant_init (SysprofProfilerAssistant *self)
self,
G_CONNECT_SWAPPED);
- sysprof_environ_editor_set_environ (self->environ_editor, environ);
+ sysprof_environ_editor_set_environ (self->environ_editor, environ_);
}
void
--
2.22.0