r.report: Work with any mask name (also for r.kappa) (OSGeo#4633)

Use Rast_mask_status in r.report and r.kappa to get the name and state.
a0x8o · Nov 11, 2024 · 62f9952 · 62f9952
1 parent 593f1a6
commit 62f9952
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/raster/r.kappa/mask.c b/raster/r.kappa/mask.c
@@ -13,15 +13,17 @@ char *maskinfo(void)
 {
     struct Reclass reclass;
     char *results;
-    char text[100];
+    char text[2 * GNAME_MAX + GMAPSET_MAX];
     int next;
     int first;
+    char mask_name[GNAME_MAX];
+    char mask_mapset[GMAPSET_MAX];
 
     results = NULL;
-    if (G_find_raster("MASK", G_mapset()) == NULL)
+    if (!Rast_mask_status(mask_name, mask_mapset, NULL, NULL, NULL))
         return "none";
-    if (Rast_get_reclass("MASK", G_mapset(), &reclass) <= 0) {
-        sprintf(text, "MASK in %s", G_mapset());
+    if (Rast_get_reclass(mask_name, mask_mapset, &reclass) <= 0) {
+        sprintf(text, "%s in %s", mask_name, mask_mapset);
         return append(results, text);
     }
 

diff --git a/raster/r.report/maskinfo.c b/raster/r.report/maskinfo.c
@@ -13,15 +13,17 @@ char *maskinfo(void)
 {
     struct Reclass reclass;
     char *results;
-    char text[100];
+    char text[2 * GNAME_MAX + GMAPSET_MAX];
     int next;
     int first;
+    char mask_name[GNAME_MAX];
+    char mask_mapset[GMAPSET_MAX];
 
     results = NULL;
-    if (G_find_raster("MASK", G_mapset()) == NULL)
+    if (!Rast_mask_status(mask_name, mask_mapset, NULL, NULL, NULL))
         return "none";
-    if (Rast_get_reclass("MASK", G_mapset(), &reclass) <= 0) {
-        sprintf(text, "MASK in %s", G_mapset());
+    if (Rast_get_reclass(mask_name, mask_mapset, &reclass) <= 0) {
+        sprintf(text, "%s in %s", mask_name, mask_mapset);
         return append(results, text);
     }