[glib: 5/11] Fix global variable name hidden by local variables in glib/tests/option-context.c
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 5/11] Fix global variable name hidden by local variables in glib/tests/option-context.c
- Date: Tue, 22 Feb 2022 08:40:05 +0000 (UTC)
commit 2885cbd737e4f83c6ca22ec1b544acb08913aa60
Author: Loic Le Page <llepage fluendo com>
Date: Wed Jan 19 12:40:46 2022 +0100
Fix global variable name hidden by local variables in glib/tests/option-context.c
glib/tests/option-context.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c
index d4ed3a94f..0fdb67c9a 100644
--- a/glib/tests/option-context.c
+++ b/glib/tests/option-context.c
@@ -28,15 +28,14 @@
#include <locale.h>
#include <math.h>
-
-static GOptionEntry main_entries[] = {
+static GOptionEntry global_main_entries[] = {
{ "main-switch", 0, 0,
G_OPTION_ARG_NONE, NULL,
"A switch that is in the main group", NULL },
G_OPTION_ENTRY_NULL
};
-static GOptionEntry group_entries[] = {
+static GOptionEntry global_group_entries[] = {
{ "test-switch", 0, 0,
G_OPTION_ARG_NONE, NULL,
"A switch that is in the test group", NULL },
@@ -54,14 +53,14 @@ make_options (int test_number)
options = g_option_context_new (NULL);
if (have_main_entries)
- g_option_context_add_main_entries (options, main_entries, NULL);
+ g_option_context_add_main_entries (options, global_main_entries, NULL);
if (have_test_entries)
{
group = g_option_group_new ("test", "Test Options",
"Show all test options",
NULL, NULL);
g_option_context_add_group (options, group);
- g_option_group_add_entries (group, group_entries);
+ g_option_group_add_entries (group, global_group_entries);
}
return options;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]