Skip to content

Commit

Permalink
checks: Indent mask-related code (#2389)
Browse files Browse the repository at this point in the history 
A whitespace-only change after running grass_indent.sh.
  • Loading branch information
@wenzeslaus
wenzeslaus committed May 20, 2022
1 parent bee9c29 commit 8b4ccfb
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 80 deletions.
26 changes: 13 additions & 13 deletions lib/raster/auto_mask.c
View file
Expand Up @@ -44,30 +44,30 @@ 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); */

/* look for the existence of the MASK file */
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(); */
Expand All @@ -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;
}
Expand All @@ -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();
}
}
18 changes: 9 additions & 9 deletions lib/raster/mask_info.c
View file
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
58 changes: 29 additions & 29 deletions raster/r.kappa/mask.c
View file
Expand Up @@ -19,26 +19,26 @@ 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);
results = append(results, text);
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);

Expand All @@ -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;
}
Expand All @@ -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);
}
Expand All @@ -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);
Expand Down
58 changes: 29 additions & 29 deletions raster/r.report/maskinfo.c
View file
Expand Up @@ -16,26 +16,26 @@ 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);
results = append(results, text);
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);
Expand All @@ -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;
}

Expand All @@ -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);

Expand All @@ -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;
Expand Down

0 comments on commit 8b4ccfb

Please sign in to comment.