From 8b4ccfb47f34da4178bb24df5649fdf0f3ff4857 Mon Sep 17 00:00:00 2001 From: Vaclav Petras Date: Fri, 20 May 2022 12:50:27 -0400 Subject: [PATCH] checks: Indent mask-related code (#2389) A whitespace-only change after running grass_indent.sh. --- lib/raster/auto_mask.c | 26 ++++++++--------- lib/raster/mask_info.c | 18 ++++++------ raster/r.kappa/mask.c | 58 +++++++++++++++++++------------------- raster/r.report/maskinfo.c | 58 +++++++++++++++++++------------------- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/lib/raster/auto_mask.c b/lib/raster/auto_mask.c index b5650157fbc..b66f1718da1 100644 --- a/lib/raster/auto_mask.c +++ b/lib/raster/auto_mask.c @@ -44,7 +44,7 @@ int Rast__check_for_auto_masking(void) if R__.auto_mask is not set (-1) or set (>=0) recheck the MASK */ if (R__.auto_mask < -1) - return R__.auto_mask; + return R__.auto_mask; /* if(R__.mask_fd > 0) G_free (R__.mask_buf); */ @@ -52,22 +52,22 @@ int Rast__check_for_auto_masking(void) R__.auto_mask = (G_find_raster("MASK", G_mapset()) != 0); if (R__.auto_mask <= 0) - return 0; + return 0; /* check MASK projection/zone against current region */ Rast_get_cellhd("MASK", G_mapset(), &cellhd); if (cellhd.zone != G_zone() || cellhd.proj != G_projection()) { - R__.auto_mask = 0; - return 0; + R__.auto_mask = 0; + return 0; } if (R__.mask_fd >= 0) - Rast_unopen(R__.mask_fd); + Rast_unopen(R__.mask_fd); R__.mask_fd = Rast__open_old("MASK", G_mapset()); if (R__.mask_fd < 0) { - R__.auto_mask = 0; - G_warning(_("Unable to open automatic MASK file")); - return 0; + R__.auto_mask = 0; + G_warning(_("Unable to open automatic MASK file")); + return 0; } /* R__.mask_buf = Rast_allocate_c_buf(); */ @@ -89,9 +89,9 @@ void Rast_suppress_masking(void) Rast__init(); if (R__.auto_mask > 0) { - Rast_close(R__.mask_fd); - /* G_free (R__.mask_buf); */ - R__.mask_fd = -1; + Rast_close(R__.mask_fd); + /* G_free (R__.mask_buf); */ + R__.mask_fd = -1; } R__.auto_mask = -2; } @@ -108,7 +108,7 @@ void Rast_unsuppress_masking(void) Rast__init(); if (R__.auto_mask < -1) { - R__.mask_fd = -1; - Rast__check_for_auto_masking(); + R__.mask_fd = -1; + Rast__check_for_auto_masking(); } } diff --git a/lib/raster/mask_info.c b/lib/raster/mask_info.c index 0f6cf3183b2..792510879dc 100644 --- a/lib/raster/mask_info.c +++ b/lib/raster/mask_info.c @@ -40,14 +40,14 @@ char *Rast_mask_info(void) switch (Rast__mask_info(name, mapset)) { case 1: - sprintf(text, _("<%s> in mapset <%s>"), name, mapset); - break; + sprintf(text, _("<%s> in mapset <%s>"), name, mapset); + break; case -1: - strcpy(text, _("none")); - break; + strcpy(text, _("none")); + break; default: - strcpy(text, _("not known")); - break; + strcpy(text, _("not known")); + break; } return G_store(text); @@ -61,11 +61,11 @@ int Rast__mask_info(char *name, char *mapset) strcpy(mapset, G_mapset()); if (!G_find_raster(name, mapset)) - return -1; + return -1; if (Rast_is_reclass(name, mapset, rname, rmapset) > 0) { - strcpy(name, rname); - strcpy(mapset, rmapset); + strcpy(name, rname); + strcpy(mapset, rmapset); } return 1; diff --git a/raster/r.kappa/mask.c b/raster/r.kappa/mask.c index b076138fa98..0f41fb7b8ff 100644 --- a/raster/r.kappa/mask.c +++ b/raster/r.kappa/mask.c @@ -19,10 +19,10 @@ char *maskinfo(void) results = NULL; if (G_find_raster("MASK", G_mapset()) == NULL) - return "none"; + return "none"; if (Rast_get_reclass("MASK", G_mapset(), &reclass) <= 0) { - sprintf(text, "MASK in %s", G_mapset()); - return append(results, text); + sprintf(text, "MASK in %s", G_mapset()); + return append(results, text); } sprintf(text, "%s in %s", reclass.name, reclass.mapset); @@ -30,15 +30,15 @@ char *maskinfo(void) next = 0; first = 1; do { - next = reclass_text(text, &reclass, next); - if (*text == 0) - break; - if (first) { - first = 0; - results = append(results, ", categories"); - } - results = append(results, " "); - results = append(results, text); + next = reclass_text(text, &reclass, next); + if (*text == 0) + break; + if (first) { + first = 0; + results = append(results, ", categories"); + } + results = append(results, " "); + results = append(results, text); } while (next >= 0); Rast_free_reclass(&reclass); @@ -54,21 +54,21 @@ static int reclass_text(char *text, struct Reclass *reclass, int next) n = reclass->num; first = -1; for (i = next; i < n; i++) { - if (reclass->table[i]) { - if (first < 0) - first = i; - } - else if (first >= 0) { - do_text(text, (long)(first + reclass->min), - (long)(i - 1 + reclass->min)); - first = -1; - if (strlen(text) > 60) - return i; - } + if (reclass->table[i]) { + if (first < 0) + first = i; + } + else if (first >= 0) { + do_text(text, (long)(first + reclass->min), + (long)(i - 1 + reclass->min)); + first = -1; + if (strlen(text) > 60) + return i; + } } if (first >= 0) - do_text(text, (long)(first + reclass->min), - (long)(i - 1 + reclass->min)); + do_text(text, (long)(first + reclass->min), + (long)(i - 1 + reclass->min)); return -1; } @@ -79,12 +79,12 @@ static void do_text(char *text, long first, long last) char work[40]; if (*text) - strcat(text, " "); + strcat(text, " "); if (first == last) - sprintf(work, "%ld", first); + sprintf(work, "%ld", first); else - sprintf(work, "%ld-%ld", first, last); + sprintf(work, "%ld-%ld", first, last); strcat(text, work); } @@ -93,7 +93,7 @@ static void do_text(char *text, long first, long last) static char *append(char *results, char *text) { if (results == NULL) - return G_store(text); + return G_store(text); results = G_realloc(results, strlen(results) + strlen(text) + 1); strcat(results, text); diff --git a/raster/r.report/maskinfo.c b/raster/r.report/maskinfo.c index 5f6ee11cdd7..bb505c2758e 100644 --- a/raster/r.report/maskinfo.c +++ b/raster/r.report/maskinfo.c @@ -16,10 +16,10 @@ char *maskinfo(void) results = NULL; if (G_find_raster("MASK", G_mapset()) == NULL) - return "none"; + return "none"; if (Rast_get_reclass("MASK", G_mapset(), &reclass) <= 0) { - sprintf(text, "MASK in %s", G_mapset()); - return append(results, text); + sprintf(text, "MASK in %s", G_mapset()); + return append(results, text); } sprintf(text, "%s in %s", reclass.name, reclass.mapset); @@ -27,15 +27,15 @@ char *maskinfo(void) next = 0; first = 1; do { - next = reclass_text(text, &reclass, next); - if (*text == 0) - break; - if (first) { - first = 0; - results = append(results, ", categories"); - } - results = append(results, " "); - results = append(results, text); + next = reclass_text(text, &reclass, next); + if (*text == 0) + break; + if (first) { + first = 0; + results = append(results, ", categories"); + } + results = append(results, " "); + results = append(results, text); } while (next >= 0); Rast_free_reclass(&reclass); @@ -54,21 +54,21 @@ static int reclass_text(char *text, struct Reclass *reclass, int next) first = -1; for (i = next; i < n; i++) { - if (reclass->table[i]) { - if (first < 0) - first = i; - } - else if (first >= 0) { - do_text(text, (long)(first + reclass->min), - (long)(i - 1 + reclass->min)); - first = -1; - if (strlen(text) > 60) - return i; - } + if (reclass->table[i]) { + if (first < 0) + first = i; + } + else if (first >= 0) { + do_text(text, (long)(first + reclass->min), + (long)(i - 1 + reclass->min)); + first = -1; + if (strlen(text) > 60) + return i; + } } if (first >= 0) - do_text(text, (long)(first + reclass->min), - (long)(i - 1 + reclass->min)); + do_text(text, (long)(first + reclass->min), + (long)(i - 1 + reclass->min)); return -1; } @@ -77,12 +77,12 @@ static int do_text(char *text, long first, long last) char work[40]; if (*text) - strcat(text, " "); + strcat(text, " "); if (first == last) - sprintf(work, "%ld", first); + sprintf(work, "%ld", first); else - sprintf(work, "%ld-%ld", first, last); + sprintf(work, "%ld-%ld", first, last); strcat(text, work); @@ -92,7 +92,7 @@ static int do_text(char *text, long first, long last) static char *append(char *results, char *text) { if (results == NULL) - return G_store(text); + return G_store(text); results = G_realloc(results, strlen(results) + strlen(text) + 1); strcat(results, text); return results;