Change exit(-1) to exit(EXIT_FAILURE); a negative argument to exit() is invalid

Miscellaneous tidying


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

db/drivers/dbf/main_debug.c

@@ -21,7 +21,7 @@ int main(int argc, char *argv[])
 
     driver = db_start_driver("dbf");
     if (driver == NULL)
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     db_init_handle(&handle);
     db_set_handle(&handle, "dbf_catalog", NULL);

display/d.barscale/main.c

@@ -103,7 +103,7 @@ int main(int argc, char **argv)
     opt3->description =
 	_("The screen coordinates for top-left corner of label ([0,0] is top-left of frame)");
 
-    if (G_parser(argc, argv) < 0)
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
 

display/d.colortable/main.c

@@ -95,7 +95,7 @@ int main(int argc, char **argv)
 
     /* Check command line */
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     map_name = opt1->answer;
     mapset = G_find_cell2(map_name, "");

display/d.geodesic/main.c

@@ -71,14 +71,10 @@ int main(int argc, char *argv[])
     /*    parm.tcolor->options    = D_color_list(); */
 
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
-    if (G_projection() != PROJECTION_LL) {
-	sprintf(msg, "%s: database is not a %s\n",
-		argv[0], G__projection_name(PROJECTION_LL));
-	G_fatal_error(msg);
-	exit(1);
-    }
+    if (G_projection() != PROJECTION_LL)
+	G_fatal_error(_("Database is not a %s"), G__projection_name(PROJECTION_LL));
 
     if (parm.coor->answers[0] == NULL)
 	G_fatal_error("No coordinates given");

display/d.labels/main.c

@@ -75,7 +75,7 @@ int main(int argc, char **argv)
 
     /* Check command line */
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     /* Save map name */
     label_name = opt1->answer;

display/d.rast.arrow/arrow.c

@@ -182,7 +182,7 @@ int main(int argc, char **argv)
 
     /* Check command line */
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
 
     strncpy(layer_name, opt1->answer, sizeof(layer_name) - 1);

display/d.rhumbline/main.c

@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
 #endif
 
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     if (G_projection() != PROJECTION_LL)
 	G_fatal_error("%s: database is not a %s database",

general/g.access/main.c

@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     other_opt->options = "grant,revoke";
     other_opt->description = _("Access for others");
 
-    if (G_parser(argc, argv) < 0)
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     /* get the unix file name for the mapset directory */

general/g.parser/main.c

@@ -356,7 +356,7 @@ int main(int argc, char *argv[])
     if (translate_output)
 	return EXIT_SUCCESS;
 
-    if (G_parser(argc - 1, argv + 1) < 0)
+    if (G_parser(argc - 1, argv + 1))
 	return 1;
 
     /* Because shell from MINGW and CygWin converts all variables

general/g.pnmcomp/main.c

@@ -333,8 +333,8 @@ int main(int argc, char *argv[])
     opt.bg->type = TYPE_STRING;
     opt.bg->description = _("Background color");
 
-    if (G_parser(argc, argv) < 0)
-	return 1;
+    if (G_parser(argc, argv))
+	exit(EXIT_FAILURE);
 
     width = atoi(opt.width->answer);
     height = atoi(opt.height->answer);

general/manage/cmd/list.c

@@ -69,40 +69,37 @@ int main(int argc, char *argv[])
     mapset->required = NO;
     mapset->multiple = NO;
     mapset->description = _("Mapset to list (default: current search path)");
-#define MAPSET mapset->answer
 
     full = G_define_flag();
     full->key = 'f';
     full->description = _("Verbose listing (also list map titles)");
-#define FULL full->answer
 
-    if (G_parser(argc, argv)) {
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
-    }
 
-    if (MAPSET == NULL)
-	MAPSET = "";
+    if (mapset->answer == NULL)
+	mapset->answer = "";
 
-    if (G_strcasecmp(MAPSET, ".") == 0)
-	MAPSET = G_mapset();
+    if (G_strcasecmp(mapset->answer, ".") == 0)
+	mapset->answer = G_mapset();
 
     i = 0;
     while (element->answers[i]) {
 	n = parse(element->answers[i]);
 
-	if (FULL) {
-	    char lister[300];
+	if (full->answer) {
+	    char lister[GPATH_MAX];
 
 	    sprintf(lister, "%s/etc/lister/%s", G_gisbase(),
 		    list[n].element[0]);
 	    G_debug(3, "lister CMD: %s", lister);
 	    if (access(lister, 1) == 0)	/* execute permission? */
-		G_spawn(lister, lister, MAPSET, NULL);
+		G_spawn(lister, lister, mapset->answer, NULL);
 	    else
-		do_list(n, MAPSET);
+		do_list(n, mapset->answer);
 	}
 	else {
-	    do_list(n, MAPSET);
+	    do_list(n, mapset->answer);
 	}
 
 	i++;

imagery/i.cca/main.c

@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
     out_opt = G_define_standard_option(G_OPT_R_OUTPUT);
     out_opt->description = _("Output raster map prefix name");
 
-    if (G_parser(argc, argv) < 0)
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     if (G_legal_filename(grp_opt->answer) < 0)

imagery/i.class/main.c

@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
     in_sig->required = NO;
     in_sig->description = _("File containing input signatures (seed)");
 
-    if (G_parser(argc, argv) < 0)
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
 

imagery/i.his.rgb/h2rmain.c

@@ -72,7 +72,7 @@ int main(int argc, char **argv)
     opt_blue->key = "blue_output";
     opt_blue->description = _("Output map representing the blue");
 
-    if (G_parser(argc, argv) < 0)
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     /* get dimension of the image */

imagery/i.ortho.photo/photo.rectify/get_wind.c

@@ -36,7 +36,7 @@ int get_target_window(void)
 #endif
 
     if (G_get_cellhd(name, mapset, &cellhd) < 0)
-	exit(-1);
+	exit(EXIT_FAILURE);
 
 #ifdef DEBUG3
     fprintf(Bugsr, "current window: n s = %f %f, \n", cellhd.north,

imagery/i.pca/main.c

@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     opt_scale->description =
 	_("Rescaling range output (For no rescaling use 0,0)");
 
-    if (G_parser(argc, argv) < 0)
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     /* determine number of bands passed in */

imagery/i.rgb.his/r2hmain.c

@@ -72,7 +72,7 @@ int main(int argc, char **argv)
     opt_sat->key = "saturation_output";
     opt_sat->description = _("Output saturation raster map");
 
-    if (G_parser(argc, argv) < 0)
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     /* get dimension of the image */

lib/linkm/oom.c

@@ -4,5 +4,5 @@
 int link_out_of_memory(void)
 {
     fprintf(stderr, "LinkM: Out of memory\n");
-    exit(-1);
+    exit(EXIT_FAILURE);
 }

lib/vector/diglib/allocation.c

@@ -41,7 +41,7 @@ void *dig_alloc_space(int n_wanted,
     if (p == NULL) {
 	fprintf(stderr, "\nERROR: out of memory.  memory asked for: %d\n",
 		n_wanted);
-	exit(-1);
+	exit(EXIT_FAILURE);
     }
 
     return (p);
@@ -95,7 +95,7 @@ void *dig_falloc(int nelem, int elsize)
     if ((ret = dig__falloc(nelem, elsize)) == NULL) {
 	fprintf(stderr, "Out of Memory.\n");
 	G_sleep(2);
-	exit(-1);
+	exit(EXIT_FAILURE);
     }
     return (ret);
 }
@@ -107,7 +107,7 @@ void *dig_frealloc(void *oldptr, int nelem, int elsize, int oldnelem)
     if ((ret = dig__frealloc(oldptr, nelem, elsize, oldnelem)) == NULL) {
 	fprintf(stderr, "\nOut of Memory on realloc.\n");
 	G_sleep(2);
-	exit(-1);
+	exit(EXIT_FAILURE);
     }
     return (ret);
 }

raster/r.basins.fill/main.c

@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
     opt4->description = _("Name for the resultant watershed partition file");
     opt4->gisprompt = "new,cell,raster";
 
-    if (G_parser(argc, argv) < 0)
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     sscanf(opt1->answer, "%d", &tpass);

raster/r.in.bin/main.c

@@ -359,7 +359,7 @@ int main(int argc, char *argv[])
     if (fd == NULL) {
 	perror(input);
 	G_usage();
-	exit(-1);
+	exit(EXIT_FAILURE);
     }
 
     /* Read binary GMT style header */

raster/r.in.gridatb/main.c

@@ -58,9 +58,8 @@ int main(int argc, char **argv)
     params.output->required = YES;
     params.output->gisprompt = "new,cell,raster";
 
-    if (G_parser(argc, argv)) {
-	exit(-1);
-    }
+    if (G_parser(argc, argv))
+	exit(EXIT_FAILURE);
 
     file = params.input->answer;
     oname = params.output->answer;

raster/r.le/r.le.patch/input.c

@@ -199,9 +199,9 @@ void user_input(int argc, char **argv)
     out->required = NO;
 
 
-    if (G_parser(argc, argv)) {
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
-    }
+
     /* record the user inputs for map,
        sam and out parameters */
 

raster/r.le/r.le.setup/polytocell/bmf_to_cll.c

@@ -40,7 +40,7 @@ int main(argc, argv)
     char *mapset;
 
     if (argc != 2)
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     G_gisinit("bmif_to_cell");
 
@@ -134,5 +134,5 @@ int quit(void)
 {
     fprintf(stderr,
 	    "    You drew a region outside the mask; restart REGIONS setup\n");
-    exit(-1);
+    exit(EXIT_FAILURE);
 }

raster/r.le/r.le.setup/polytocell/ply_t_bmif.c

@@ -8,7 +8,7 @@
 
 #define MAXLINE	 90
 #define FGET	    fgets(buff,MAXLINE,stdin)
-#define READLINE	if (FGET==NULL) exit(-1) ;\
+#define READLINE	if (FGET==NULL) exit(EXIT_FAILURE) ;\
 					sscanf (buff,"%1c %lf %lf %d\n", &type, &U_y, &U_x, &code)
 #define XADJ(x)	 (x * U_to_A_xconv + U_to_A_xadd) ;
 #define YADJ(y)	 (y * U_to_A_yconv + U_to_A_yadd) ;
@@ -38,7 +38,7 @@ int main(void)
     /* read through Grips Header to pick up coordinate conversion factors */
     do {
 	if (FGET == NULL)
-	    exit(-1);
+	    exit(EXIT_FAILURE);
 	sscanf(buff, "%s\n", word);
 	incr = strcmp("ENDT\0", word);
     }
@@ -109,7 +109,7 @@ int main(void)
 			"  number of vertices read: %d   allowed: %d\n",
 			num_verticies, MAX_VERTICIES);
 		fprintf(stderr, "ABORTING\n");
-		exit(-1);
+		exit(EXIT_FAILURE);
 	    }
 	    READLINE;
 	}

raster/r.sum/main.c

@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
 
 
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     cellmap = G_find_file2("cell", rast->answer, "");
     if (!cellmap) {

raster/r.topidx/main.c

@@ -49,9 +49,8 @@ int main(int argc, char **argv)
     params.output->key = "output";
     params.output->description = _("Output topographic index map");
 
-    if (G_parser(argc, argv)) {
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
-    }
 
     /* Make sure that the current projection is not lat/long */
     if ((G_projection() == PROJECTION_LL))

raster/r.topmodel/main.c

@@ -169,9 +169,8 @@ int main(int argc, char **argv)
     flag.input->key = 'i';
     flag.input->description = _("Input data given for (o/i)");
 
-    if (G_parser(argc, argv)) {
-	exit(-1);
-    }
+    if (G_parser(argc, argv))
+	exit(EXIT_FAILURE);
 
     /* Store given parameters and flags */
     map.basin = param.basin->answer;

raster3d/base/r3.timestamp.main.c

@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
     date->type = TYPE_STRING;
     date->description = _("Datetime, datetime1/datetime2, or none");
 
-    if (G_parser(argc, argv) < 0)
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
     name = map->answer;

raster3d/r3.out.ascii/main.c

@@ -153,7 +153,7 @@ FILE *openAscii(char *asciiFile, G3D_Region region)
 	if (fp == NULL) {
 	    perror(asciiFile);
 	    G_usage();
-	    exit(-1);
+	    exit(EXIT_FAILURE);
 	}
     }
     else
@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
 
     /* Have GRASS get inputs */
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     /* Parse input parameters */
     getParams(&input, &output, &decim);

raster3d/r3.out.v5d/main.c

@@ -299,7 +299,7 @@ int main(int argc, char *argv[])
 
     /* Have GRASS get inputs */
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     /* Parse input parameters */
     getParams(&input, &output, &decim);

raster3d/r3.showdspf/main_ogl.c

@@ -135,7 +135,7 @@ int main(int argc, char **argv)
     colr->description = "Name of existing color table";
 
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     /* set-up for select() */
     if (pipe(fdes))
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
 
 	if (NULL == (dsp =
 		     check_get_any_dspname(dspf->answer, g3->answer, NULL)))
-	    exit(-1);
+	    exit(EXIT_FAILURE);
 
 
 	/* TODO - check color file */
@@ -206,13 +206,13 @@ int main(int argc, char **argv)
 	if ((Headfax.dspfinfp = G_fopen_old(buff, dsp, mapset)) == NULL) {
 	    fprintf(stderr, "ERROR: unable to open %s for reading\n",
 		    Headfax.dspfinfp);
-	    exit(-1);
+	    exit(EXIT_FAILURE);
 	}
 
 	/* read header info from dspf file into GLOBAL variable Headfax */
 	if (dfread_header(&Headfax) < 0) {
 	    fprintf(stderr, "ERROR:  while reading dspf file header\n");
-	    exit(-1);
+	    exit(EXIT_FAILURE);
 	}
 
 	/* set 3dmap for data in Headfax */

sites/s.in.ascii/main.c

@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
     parm.date->description = "datetime or datetime1/datetime2";
 
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     if ((input = parm.input->answer)) {
 	in_fd = fopen(input, "r");

vector/v.clean/test/topocheck.c

@@ -36,6 +36,8 @@ int main(int argc, char *argv[])
     int nareas1, nareas2;
     double tarea1, tarea2, darea, pdarea;
 
+    G_gisinit(argv[0]);
+
     module = G_define_module();
     module->keywords = _("vector");
     module->description = "Break lines at intersections.";
@@ -48,9 +50,8 @@ int main(int argc, char *argv[])
     poly_f->description =
 	"Write areas and isles as closed polygons instead of topo check";
 
-    G_gisinit(argv[0]);
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE));
 
     Points = Vect_new_line_struct();
     Cats = Vect_new_cats_struct();

vector/v.label.sa/main.c

@@ -25,7 +25,7 @@
  * @param argv The command line arguments.
  * @param p The parameters structure.
  */
-static int parse_args(int argc, char *argv[], struct params *p);
+static void parse_args(int argc, char *argv[], struct params *p);
 
 /**
  * The main function controls the program flow.
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
 
     //    fprintf(stderr, "Parsing options and flags\n");
     /* parse options and flags */
-    if (parse_args(argc, argv, &p))
-	exit(EXIT_FAILURE);
+    parse_args(argc, argv, &p);
+
     /* initialize labels (get text from database, and get features) */
     labels = labels_init(&p, &n_labels);
     /* start algorithm */
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
     return EXIT_SUCCESS;
 }
 
-static int parse_args(int argc, char *argv[], struct params *p)
+static void parse_args(int argc, char *argv[], struct params *p)
 {
     p->map = G_define_standard_option(G_OPT_V_MAP);
 
@@ -230,7 +230,8 @@ static int parse_args(int argc, char *argv[], struct params *p)
     p->bowidth->answer = "0";
     p->bowidth->guisection = _("Colors");
 
-    return G_parser(argc, argv);
+    if (G_parser(argc, argv))
+	exit(EXIT_FAILURE);
 }
 
 void print_label(FILE * labelf, label_t * label, struct params *p)

vector/v.out.pov/main.c

@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 	"\t\tExample: \"pigment { color red 0 green 1 blue 0 }\"";
 
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     /* Check output type */
     otype = Vect_option_to_types(type_opt);

vector/v.out.svg/main.c

@@ -104,9 +104,8 @@ int main(int argc, char *argv[])
 
     field_opt = G_define_standard_option(G_OPT_V_FIELD);
 
-    if (G_parser(argc, argv)) {
+    if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
-    }
 
     Points = Vect_new_line_struct();
     Cats = Vect_new_cats_struct();

vector/v.split/main.c

@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     vertices_opt->description = "Maximum number of vertices in segment.";
 
     if (G_parser(argc, argv))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     /* layer = atoi ( layer_opt->answer ); */
 

vector/v.transform/creat_trans.c

@@ -39,7 +39,7 @@ int create_transform_from_file(struct file_info *Coord, int quiet)
     n_points = 0;
     /*  Get the coordinates from the file.  */
     if ((n_points = get_coor_from_file(Coord->fp)) < 0)
-	exit(-1);
+	G_fatal_error(_("Error reading coordinates file"));
 
     status = setup_transform(n_points);
 
@@ -47,7 +47,7 @@ int create_transform_from_file(struct file_info *Coord, int quiet)
 	G_message(_("Number of points that have been entered [%d]"),
 		  n_points);
 	print_transform_error(status);
-	exit(-1);
+	G_fatal_error(_("Error creating transformation"));
     }
 
     if (!quiet)

visualization/nviz/src/nviz_init.c

@@ -414,7 +414,7 @@ int Ngetargs(Tcl_Interp * interp,	/* Current interpreter. */
     }
 
     if (TCL_ERROR == Tcl_SplitList(interp, tmp2, &argc, args))
-	exit(-1);
+	exit(EXIT_FAILURE);
 
     return (argc);
 }