From d937713c424a6cb1a365a1ade214c97ab5f7f357 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 8 Mar 2025 15:59:45 +0100 Subject: .lat{ => itude}, .lon{ => gitude} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/common.h | 4 ++-- src/location-geoclue2.c | 8 ++++---- src/location-manual.c | 10 +++++----- src/redshift.c | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/common.h b/src/common.h index 22253e7..dedd259 100644 --- a/src/common.h +++ b/src/common.h @@ -236,12 +236,12 @@ struct location { /** * Degrees north of the equator */ - double lat; + double latitude; /** * Degrees east of the prime meridian */ - double lon; + double longitude; }; diff --git a/src/location-geoclue2.c b/src/location-geoclue2.c index 5e66465..1fcfa51 100644 --- a/src/location-geoclue2.c +++ b/src/location-geoclue2.c @@ -107,10 +107,10 @@ geoclue_client_signal_cb(GDBusProxy *client, gchar *sender_name, gchar *signal_n /* Read location properties */ lat_v = g_dbus_proxy_get_cached_property(location, "Latitude"); - state->location.lat = g_variant_get_double(lat_v); + state->location.latitude = g_variant_get_double(lat_v); lon_v = g_dbus_proxy_get_cached_property(location, "Longitude"); - state->location.lon = g_variant_get_double(lon_v); + state->location.longitude = g_variant_get_double(lon_v); state->available = 1; @@ -318,8 +318,8 @@ location_geoclue2_start(struct location_state *state) state->available = 0; state->error = 0; - state->location.lat = 0; - state->location.lon = 0; + state->location.latitude = 0; + state->location.longitude = 0; if (pipeutils_create_nonblocking(pipefds)) { weprintf(_("Failed to start GeoClue2 provider!")); diff --git a/src/location-manual.c b/src/location-manual.c index aeffa10..da34ea2 100644 --- a/src/location-manual.c +++ b/src/location-manual.c @@ -29,8 +29,8 @@ static int location_manual_init(struct location_state **state) { *state = emalloc(sizeof(**state)); - (*state)->loc.lat = NAN; - (*state)->loc.lon = NAN; + (*state)->loc.latitude = NAN; + (*state)->loc.longitude = NAN; return 0; } @@ -38,7 +38,7 @@ GCC_ONLY(__attribute__((__pure__))) static int location_manual_start(struct location_state *state) { - if (isnan(state->loc.lat) || isnan(state->loc.lon)) + if (isnan(state->loc.latitude) || isnan(state->loc.longitude)) eprintf(_("Latitude and longitude must be set.")); return 0; } @@ -80,9 +80,9 @@ location_manual_set_option(struct location_state *state, const char *key, const } if (!strcasecmp(key, "lat")) { - state->loc.lat = v; + state->loc.latitude = v; } else if (!strcasecmp(key, "lon")) { - state->loc.lon = v; + state->loc.longitude = v; } else { weprintf(_("Unknown method parameter: `%s'."), key); return -1; diff --git a/src/redshift.c b/src/redshift.c index 7170a03..295b1d4 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -190,8 +190,8 @@ print_location(const struct location *location) The string following each number is an abreviation for north, source, east or west (N, S, E, W). */ printf(_("Location: %.2f %s, %.2f %s\n"), - fabs(location->lat), location->lat >= 0.0 ? north : south, - fabs(location->lon), location->lon >= 0.0 ? east : west); + fabs(location->latitude), location->latitude >= 0.0 ? north : south, + fabs(location->longitude), location->longitude >= 0.0 ? east : west); } /* Interpolate color setting structs given alpha. */ @@ -379,12 +379,12 @@ gamma_is_valid(const double gamma[3]) static int location_is_valid(const struct location *location) { - if (!WITHIN(MIN_LATITUDE, location->lat, MAX_LATITUDE)) { + if (!WITHIN(MIN_LATITUDE, location->latitude, MAX_LATITUDE)) { /* TRANSLATORS: Append degree symbols if possible. */ weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LATITUDE, MAX_LATITUDE); /* TODO \n */ return 0; } - if (!WITHIN(MIN_LONGITUDE, location->lon, MAX_LONGITUDE)) { + if (!WITHIN(MIN_LONGITUDE, location->longitude, MAX_LONGITUDE)) { /* TRANSLATORS: Append degree symbols if possible. */ weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LONGITUDE, MAX_LONGITUDE); /* TODO \n */ return 0; @@ -544,7 +544,7 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc } else { /* Current angular elevation of the sun */ double elevation; - if (libred_solar_elevation(loc.lat, loc.lon, &elevation)) + if (libred_solar_elevation(loc.latitude, loc.longitude, &elevation)) eprintf("libred_solar_elevation:"); period = get_period_from_elevation(scheme, elevation); @@ -653,8 +653,8 @@ run_continual_mode(const struct location_provider *provider, LOCATION_STATE *loc } if (new_available && - (!exact_eq(new_loc.lat, loc.lat) || - !exact_eq(new_loc.lon, loc.lon) || + (!exact_eq(new_loc.latitude, loc.latitude) || + !exact_eq(new_loc.longitude, loc.longitude) || new_available != location_available)) { loc = new_loc; print_location(&loc); @@ -876,7 +876,7 @@ main(int argc, char *argv[]) } else { /* Current angular elevation of the sun */ double elevation; - if (libred_solar_elevation(loc.lat, loc.lon, &elevation)) + if (libred_solar_elevation(loc.latitude, loc.longitude, &elevation)) eprintf("libred_solar_elevation:"); if (options.verbose) { /* TRANSLATORS: Append degree symbol if possible. */ -- cgit v1.2.3-70-g09d2