r3.*: keyword standardization; minor compiler warnings fixed; use standard file name for main.c of r3.timestamp

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@64026 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster3d/r3.flow/main.c

@@ -177,8 +177,8 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     G_add_keyword(_("raster3d"));
+    G_add_keyword(_("hydrology"));
     G_add_keyword(_("voxel"));
-    G_add_keyword(_("flowline"));
     module->description =
 	_("Computes 3D flow lines and 3D flow accumulation.");
 

raster3d/r3.flow/test_main.c

@@ -41,8 +41,8 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     G_add_keyword(_("raster3d"));
+    G_add_keyword(_("hydrology"));
     G_add_keyword(_("voxel"));
-    G_add_keyword(_("flowline"));
     module->description = _("Testing flow lines.");
 
     test_opt = G_define_option();

raster3d/r3.gradient/main.c

@@ -41,8 +41,8 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster3d"));
-    G_add_keyword(_("voxel"));
     G_add_keyword(_("gradient"));
+    G_add_keyword(_("voxel"));
     module->description =
 	_("Computes gradient of a 3D raster map "
 	  "and outputs gradient components as three 3D raster maps.");

raster3d/r3.in.ascii/main.c

@@ -204,6 +204,7 @@ FILE *openAscii(char *asciiFile, RASTER3D_Region * region)
 
 /*---------------------------------------------------------------------------*/
 
+#undef MAX
 #define MAX(a,b) (a > b ? a : b)
 
 void
@@ -310,8 +311,8 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     G_add_keyword(_("raster3d"));
-    G_add_keyword(_("voxel"));
     G_add_keyword(_("import"));
+    G_add_keyword(_("voxel"));
     G_add_keyword(_("conversion"));
     G_add_keyword("ASCII");
     module->description =

raster3d/r3.in.bin/main.c

@@ -251,6 +251,7 @@ int main(int argc, char *argv[]) {
 	module = G_define_module();
 	G_add_keyword(_("raster3d"));
 	G_add_keyword(_("import"));
+	G_add_keyword(_("voxel"));
 	module->description =
 			_("Imports a binary raster file into a GRASS 3D raster map.");
 

raster3d/r3.in.v5d/main.c

@@ -34,6 +34,7 @@
 #include <grass/raster3d.h>
 #include <grass/glocale.h>
 
+#undef MAX
 #define MAX(a,b) (a > b ? a : b)
 
 /*---------------------------------------------------------------------------*/
@@ -175,6 +176,7 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     G_add_keyword(_("raster3d"));
+    G_add_keyword(_("import"));
     G_add_keyword(_("voxel"));
     module->description =
 	_("Import 3-dimensional Vis5D files.");

raster3d/r3.info/main.c

@@ -74,8 +74,8 @@ int main(int argc, char *argv[])
     module = G_define_module();
     G_add_keyword(_("raster3d"));
     G_add_keyword(_("metadata"));
-    G_add_keyword(_("extent"));
     G_add_keyword(_("voxel"));
+    G_add_keyword(_("extent"));
     module->description =
 	_("Outputs basic information about a user-specified 3D raster map layer.");
 

raster3d/r3.mask/main.c

@@ -41,6 +41,7 @@ void getParams(char **name, d_Mask ** maskRules)
 
 /*-------------------------------------------------------------------------*/
 
+#undef MAX
 #define MAX(a,b) (a > b ? a : b)
 
 static void makeMask(char *name, d_Mask * maskRules)

raster3d/r3.mkdspf/main.c

@@ -77,6 +77,7 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster3d"));
+    G_add_keyword(_("display"));
     G_add_keyword(_("voxel"));
     module->description =
 	_("Creates a display file from an existing 3D raster map according to specified threshold levels.");

raster3d/r3.neighbors/main.c

@@ -207,6 +207,7 @@ int main(int argc, char **argv)
     module = G_define_module();
     G_add_keyword(_("raster3d"));
     G_add_keyword(_("algebra"));
+    G_add_keyword(_("voxel"));
     G_add_keyword(_("statistics"));
     G_add_keyword(_("aggregation"));
     G_add_keyword(_("neighbor"));

raster3d/r3.null/main.c

@@ -24,6 +24,7 @@
 #include <grass/glocale.h>
 
 
+#undef MAX
 #define MAX(a,b) (a > b ? a : b)
 
 
@@ -183,6 +184,7 @@ int main(int argc, char **argv)
     G_gisinit(argv[0]);
     module = G_define_module();
     G_add_keyword(_("raster3d"));
+    G_add_keyword(_("null data"));
     G_add_keyword(_("voxel"));
     module->description =
 	_("Explicitly create the 3D NULL-value bitmap file.");

raster3d/r3.out.ascii/main.c

@@ -23,6 +23,7 @@
 #include <grass/raster3d.h>
 #include <grass/glocale.h>
 
+#undef MAX
 #define MAX(a,b) (a > b ? a : b)
 
 /* structs */
@@ -299,8 +300,8 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     G_add_keyword(_("raster3d"));
-    G_add_keyword(_("voxel"));
     G_add_keyword(_("export"));
+    G_add_keyword(_("voxel"));
     G_add_keyword(_("conversion"));
     G_add_keyword("ASCII");
     module->description =

raster3d/r3.out.bin/main.c

@@ -204,6 +204,7 @@ int main(int argc, char *argv[]) {
 	module = G_define_module();
 	G_add_keyword(_("raster3d"));
 	G_add_keyword(_("export"));
+	G_add_keyword(_("voxel"));
 	module->description = _("Exports a GRASS 3D raster map to a binary array.");
 
 	/* Define the different options */

raster3d/r3.out.netcdf/main.c

@@ -586,6 +586,7 @@ int main(int argc, char *argv[])
     G_add_keyword(_("raster3d"));
     G_add_keyword(_("export"));
     G_add_keyword(_("netCDF"));
+    G_add_keyword(_("voxel"));
     module->description = _("Export a 3D raster map as netCDF file.");
 
     /* Get parameters from user */

raster3d/r3.out.v5d/main.c

@@ -23,6 +23,7 @@
 #include <grass/raster3d.h>
 #include <grass/glocale.h>
 
+#undef MAX
 #define MAX(a,b) (a > b ? a : b)
 
 /* structs */
@@ -281,8 +282,8 @@ int main(int argc, char *argv[])
     G_gisinit(argv[0]);
     module = G_define_module();
     G_add_keyword(_("raster3d"));
-    G_add_keyword(_("voxel"));
     G_add_keyword(_("export"));
+    G_add_keyword(_("voxel"));
     module->description =
 	_("Exports GRASS 3D raster map to 3-dimensional Vis5D file.");
 

raster3d/r3.out.vtk/main.c

@@ -374,8 +374,8 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster3d"));
-    G_add_keyword(_("voxel"));
     G_add_keyword(_("export"));
+    G_add_keyword(_("voxel"));
     G_add_keyword("VTK");
     module->description =
         _("Converts 3D raster maps into the VTK-ASCII format.");

raster3d/r3.stats/main.c

@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     G_add_keyword(_("raster3d"));
     G_add_keyword(_("statistics"));
+    G_add_keyword(_("voxel"));
     module->description = _("Generates volume statistics for 3D raster maps.");
 
     /* Define the different options */

raster3d/r3.support/main.c

@@ -48,8 +48,9 @@ int main(int argc, char *argv[])
     module = G_define_module();
     G_add_keyword(_("raster3d"));
     G_add_keyword(_("metadata"));
+    G_add_keyword(_("voxel"));
     module->description = _("Allows creation and/or modification of "
-			    "raster3d map layer support files.");
+			    "3D raster map layer support files.");
 
     raster = G_define_standard_option(G_OPT_R3_MAP);
 

raster3d/r3.timestamp/r3.timestamp.main.c

@@ -41,6 +41,7 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster3d"));
+    G_add_keyword(_("timestamp"));
     G_add_keyword(_("voxel"));
     module->description =
 	_("Print/add/remove a timestamp for a 3D raster map");