[geocode-glib] tests: Rename a global variable to be less generic
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geocode-glib] tests: Rename a global variable to be less generic
- Date: Fri, 13 Jan 2017 23:11:58 +0000 (UTC)
commit 5bca002920c7144caab4a09ea82a9908b11270da
Author: Philip Withnall <philip withnall collabora co uk>
Date: Thu Oct 13 12:30:01 2016 +0100
tests: Rename a global variable to be less generic
Rename the commmand-line parameters variable to
‘command_line_params’ so that it isn’t shadowed by a huge number
of other variables in the file.
https://bugzilla.gnome.org/show_bug.cgi?id=756311
geocode-glib/test-gcglib.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/geocode-glib/test-gcglib.c b/geocode-glib/test-gcglib.c
index fd922f7..6c1ae2f 100644
--- a/geocode-glib/test-gcglib.c
+++ b/geocode-glib/test-gcglib.c
@@ -36,7 +36,7 @@
static GMainLoop *loop = NULL;
static gboolean enable_network = FALSE;
-static char **params = NULL;
+static char **command_line_params = NULL;
static void
print_loc (GeocodeLocation *loc)
@@ -837,13 +837,13 @@ new_loc (void)
{
gdouble latitude, longitude;
- if (params[0] == NULL ||
- *params[0] == '\0' ||
- params[1] == NULL ||
- *params[1] == '\0')
+ if (command_line_params[0] == NULL ||
+ *command_line_params[0] == '\0' ||
+ command_line_params[1] == NULL ||
+ *command_line_params[1] == '\0')
return NULL;
- latitude = g_ascii_strtod (params[0], NULL);
- longitude = g_ascii_strtod (params[1], NULL);
+ latitude = g_ascii_strtod (command_line_params[0], NULL);
+ longitude = g_ascii_strtod (command_line_params[1], NULL);
return geocode_location_new (latitude, longitude, GEOCODE_LOCATION_ACCURACY_UNKNOWN);
}
@@ -857,7 +857,7 @@ int main (int argc, char **argv)
{ "count", 0, 0, G_OPTION_ARG_INT, &answer_count, "Number of answers to get for forward
searches", NULL },
{ "reverse", 0, 0, G_OPTION_ARG_NONE, &do_rev_geocoding, "Whether to do reverse geocoding for
the given parameters", NULL },
{ "enable-network", 0, 0, G_OPTION_ARG_NONE, &enable_network, "Whether to do network queries
during unit tests, or use recorded results", NULL },
- { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, ¶ms, NULL, "[KEY=VALUE...]" },
+ { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &command_line_params, NULL,
"[KEY=VALUE...]" },
{ NULL }
};
@@ -877,7 +877,7 @@ int main (int argc, char **argv)
return 1;
}
- if (params == NULL) {
+ if (command_line_params == NULL) {
g_test_add_func ("/geocode/resolve_json", test_resolve_json);
g_test_add_func ("/geocode/search_json", test_search_json);
g_test_add_func ("/geocode/reverse", test_rev);
@@ -896,7 +896,7 @@ int main (int argc, char **argv)
if (do_rev_geocoding == FALSE) {
GeocodeForward *forward;
- forward = geocode_forward_new_for_string (params[0]);
+ forward = geocode_forward_new_for_string (command_line_params[0]);
if (answer_count != DEFAULT_ANSWER_COUNT)
geocode_forward_set_answer_count (forward, answer_count);
geocode_forward_search_async (forward, NULL, got_geocode_search_cb, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]