From 613d95ef99f29fcf42fab27d1ef26adb87745e35 Mon Sep 17 00:00:00 2001 From: Kurt Schwehr Date: Sun, 22 Apr 2018 07:52:59 -0700 Subject: PJ_isea.c: change local helper functions to void returns The return values are not used and do not mean anything. Similar to #423 --- src/PJ_isea.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/PJ_isea.c b/src/PJ_isea.c index 57412a38..6c870a2b 100644 --- a/src/PJ_isea.c +++ b/src/PJ_isea.c @@ -29,7 +29,7 @@ struct hex { /* y *must* be positive down as the xy /iso conversion assumes this */ ISEA_STATIC -int hex_xy(struct hex *h) { +void hex_xy(struct hex *h) { if (!h->iso) return 1; if (h->x >= 0) { h->y = -h->y - (h->x+1)/2; @@ -38,12 +38,10 @@ int hex_xy(struct hex *h) { h->y = -h->y - h->x/2; } h->iso = 0; - - return 1; } ISEA_STATIC -int hex_iso(struct hex *h) { +void hex_iso(struct hex *h) { if (h->iso) return 1; if (h->x >= 0) { @@ -55,12 +53,10 @@ int hex_iso(struct hex *h) { h->z = -h->x - h->y; h->iso = 1; - return 1; } ISEA_STATIC -int hexbin2(double width, double x, double y, - int *i, int *j) { +void hexbin2(double width, double x, double y, int *i, int *j) { double z, rx, ry, rz; double abs_dx, abs_dy, abs_dz; int ix, iy, iz, s; @@ -105,7 +101,6 @@ int hexbin2(double width, double x, double y, hex_xy(&h); *i = h.x; *j = h.y; - return ix * 100 + iy; } #ifndef ISEA_STATIC #define ISEA_STATIC @@ -1134,4 +1129,3 @@ PJ *PROJECTION(isea) { return P; } - -- cgit v1.2.3 From 454c1326e5f1cae87712b011434776375ac84fbb Mon Sep 17 00:00:00 2001 From: Kurt Schwehr Date: Sun, 22 Apr 2018 08:17:56 -0700 Subject: More cleanup and fix last commit Tried building before committing time --- src/PJ_isea.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/PJ_isea.c b/src/PJ_isea.c index 6c870a2b..3e941c77 100644 --- a/src/PJ_isea.c +++ b/src/PJ_isea.c @@ -30,7 +30,7 @@ struct hex { /* y *must* be positive down as the xy /iso conversion assumes this */ ISEA_STATIC void hex_xy(struct hex *h) { - if (!h->iso) return 1; + if (!h->iso) return; if (h->x >= 0) { h->y = -h->y - (h->x+1)/2; } else { @@ -42,7 +42,7 @@ void hex_xy(struct hex *h) { ISEA_STATIC void hex_iso(struct hex *h) { - if (h->iso) return 1; + if (h->iso) return; if (h->x >= 0) { h->y = (-h->y - (h->x+1)/2); @@ -600,27 +600,27 @@ isea_grid_init(struct isea_dgg * g) } ISEA_STATIC -int +void isea_orient_isea(struct isea_dgg * g) { if (!g) - return 0; + return; g->o_lat = ISEA_STD_LAT; g->o_lon = ISEA_STD_LON; g->o_az = 0.0; - return 1; + return; } ISEA_STATIC -int +void isea_orient_pole(struct isea_dgg * g) { if (!g) - return 0; + return; g->o_lat = M_PI / 2.0; g->o_lon = 0.0; g->o_az = 0; - return 1; + return; } ISEA_STATIC -- cgit v1.2.3