fixed unlucky formatted messages (thanks to Glynn)

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

imagery/i.cca/main.c

@@ -142,8 +142,7 @@ int main(int argc, char *argv[])
     /* check the number of input bands */
     bands = refs.nfiles;
     if (bands > MX - 1)
-	G_fatal_error(_
-		      ("Subgroup too large.  Maximum number of bands is %d\n."),
+	G_fatal_error(_("Subgroup too large.  Maximum number of bands is %d\n."),
 		      MX - 1);
 
     /*

imagery/i.class/add_point.c

@@ -19,8 +19,7 @@ int add_point(int x, int y)
 	return (1);
 
     if (Region.npoints >= MAX_VERTEX) {
-	G_warning(_
-		  ("Can't mark another point.  Only %d points allowed.  Sorry."),
+	G_warning(_("Can't mark another point.  Only %d points allowed.  Sorry."),
 		  MAX_VERTEX);
 	return (0);
     }

imagery/i.class/complete_reg.c

@@ -9,8 +9,7 @@
 int complete_region(void)
 {
     if (Region.npoints < 3)
-	G_warning(_
-		  ("Too few points for region.  Must have at least 3 points."));
+	G_warning(_("Too few points for region.  Must have at least 3 points."));
     else if (Region.area.completed)
 	G_warning(_("Area already completed."));
     else {

imagery/i.class/readbands.c

@@ -9,8 +9,7 @@ int readbands(int nbands, int cur)
 
     for (i = 0; i < nbands; i++)
 	if (G_get_map_row_nomask(Bandfd[i], Bandbuf[i], cur) < 0)
-	    G_fatal_error(_
-			  ("Error reading raster map in function readbands."));
+	    G_fatal_error(_("Error reading raster map in function readbands."));
 
     return 0;
 }

imagery/i.class/signature.c

@@ -47,14 +47,12 @@ int init_sig_routines(size_t nbands)
 	(Band_sum = (float *)G_calloc(nbands, sizeof(float))) == NULL ||
 	(Band_product = (float **)G_calloc(nbands, sizeof(float *))) == NULL
 	|| (Band_histo = (int **)G_calloc(nbands, sizeof(int *))) == NULL)
-	G_fatal_error(_
-		      ("Unable to allocate space for signature statistics."));
+	G_fatal_error(_("Unable to allocate space for signature statistics."));
     for (i = 0; i < nbands; i++) {
 	if ((Band_product[i] =
 	     (float *)G_calloc(nbands, sizeof(float))) == NULL ||
 	    (Band_histo[i] = (int *)G_calloc(MAX_CATS, sizeof(int))) == NULL)
-	    G_fatal_error(_
-			  ("Unable to allocate space for signature statistics."));
+	    G_fatal_error(_("Unable to allocate space for signature statistics."));
     }
 
     return 0;
@@ -112,8 +110,7 @@ int prepare_signature(int nbands)
 
 	y = P[i].y;
 	if (y != P[i - 1].y) {
-	    G_warning(_
-		      ("prepare_signature: scan line %d has odd number of points."),
+	    G_warning(_("prepare_signature: scan line %d has odd number of points."),
 		      (i + 1) / 2);
 	    return (0);
 	}
@@ -278,8 +275,7 @@ int display_signature(void)
 	if ((fd = G_open_cell_new(MASK)) < 0)
 	    G_fatal_error(_("Unable to open the cell map MASK."));
 	if ((buffer = G_allocate_cell_buf()) == NULL)
-	    G_fatal_error(_
-			  ("Unable to allocate the cell buffer in display_signature()."));
+	    G_fatal_error(_("Unable to allocate the cell buffer in display_signature()."));
 	nrows = G_window_rows();
 	ncols = G_window_cols();
 

imagery/i.cluster/checkpt.c

@@ -37,8 +37,7 @@ int checkpoint(struct Cluster *X, int n)
 	if (verbose) {
 	    cur_time = time(NULL);
 	    elapsed_time = cur_time - start_time;
-	    G_message(_
-		      ("Iteration %d: %% Convergence: %.2f (%s elapsed, %s left)"),
+	    G_message(_("Iteration %d: %% Convergence: %.2f (%s elapsed, %s left)"),
 		      X->iteration, (double)X->percent_stable,
 		      print_time(elapsed_time),
 		      print_time(iters * elapsed_time / (X->iteration + 1) -

imagery/i.cluster/main.c

@@ -310,8 +310,7 @@ int main(int argc, char *argv[])
 	    for (n = 0; n < ref.nfiles; n++)
 		x[n] = cell[n][col];
 	    if (I_cluster_point(&C, x) < 0)
-		G_fatal_error(_
-			      ("Out of Memory. Please run again and choose a smaller sample size"));
+		G_fatal_error(_("Out of Memory. Please run again and choose a smaller sample size"));
 	}
     }
     if (verbose)

imagery/i.fft/fftmain.c

@@ -160,8 +160,7 @@ int main(int argc, char *argv[])
     data[0] = (double *)G_malloc((rows * cols) * sizeof(double));
     data[1] = (double *)G_malloc((rows * cols) * sizeof(double));
     if (data[0] == NULL || data[1] == NULL)
-	G_fatal_error(_
-		      ("Insufficent memory for allocation of data structure"));
+	G_fatal_error(_("Insufficent memory for allocation of data structure"));
 
     /* Initialize real & complex components to zero */
     G_message(_("Initializing data...\n"));

imagery/i.gensig/get_train.c

@@ -50,8 +50,7 @@ int get_training_classes(struct files *files, struct Signature *S)
 	    n++;
 	}
 	else
-	    G_warning(_
-		      ("Training class [%d] only has one cell - this class will be ignored."),
+	    G_warning(_("Training class [%d] only has one cell - this class will be ignored."),
 		      cat);
     }
 

imagery/i.gensig/openfiles.c

@@ -13,8 +13,7 @@ int openfiles(struct parms *parms, struct files *files)
 
 
     if (!I_get_subgroup_ref(parms->group, parms->subgroup, &Ref))
-	G_fatal_error(_
-		      ("Unable to read REF file for subgroup [%s] in group [%s]."),
+	G_fatal_error(_("Unable to read REF file for subgroup [%s] in group [%s]."),
 		      parms->subgroup, parms->group);
 
     if (Ref.nfiles <= 0)

imagery/i.group/main.c

@@ -121,8 +121,7 @@ int main(int argc, char *argv[])
 	/* Remove files from Group */
 
 	if (I_find_group(group) == 0) {
-	    G_fatal_error(_
-			  ("Specified group does not exist in current mapset"));
+	    G_fatal_error(_("Specified group does not exist in current mapset"));
 	}
 
 	if (sgrp->answer) {
@@ -143,8 +142,7 @@ int main(int argc, char *argv[])
 	    struct Ref ref;
 
 	    if (I_find_group(group) == 0) {
-		G_fatal_error(_
-			      ("Specified group does not exist in current mapset"));
+		G_fatal_error(_("Specified group does not exist in current mapset"));
 	    }
 
 	    if (sgrp->answer) {
@@ -167,8 +165,7 @@ int main(int argc, char *argv[])
 	else {
 	    /* Create or update Group REF */
 	    if (I_find_group(group) == 0)
-		G_verbose_message(_
-				  ("Group <%s> does not yet exist. Creating..."),
+		G_verbose_message(_("Group <%s> does not yet exist. Creating..."),
 				  group);
 
 	    if (sgrp->answer) {
@@ -253,8 +250,7 @@ static int add_or_update_subgroup(char group[INAME_LEN],
 	/* Go through existing files to check for duplicates */
 	for (n = 0; n < ref.nfiles; n++) {
 	    if (strcmp(rasters[m], ref.file[n].name) == 0) {
-		G_message(_
-			  ("Raster map <%s> exists in subgroup. Skipping..."),
+		G_message(_("Raster map <%s> exists in subgroup. Skipping..."),
 			  G_fully_qualified_name(rasters[m], mapset));
 		skip = 1;
 		continue;

imagery/i.ifft/ifftmain.c

@@ -94,8 +94,7 @@ int main(int argc, char *argv[])
     if ((realfp =
 	 G_fopen_old_misc("cell_misc", "fftreal", Cellmap_real,
 			  realmapset)) == NULL)
-	G_fatal_error(_
-		      ("Unable to open real-image in the cell_misc directory.\nInput map probably wasn't created by i.fft"));
+	G_fatal_error(_("Unable to open real-image in the cell_misc directory.\nInput map probably wasn't created by i.fft"));
 
     if ((imagmapset = G_find_cell(Cellmap_imag, "")) == NULL)
 	G_fatal_error(_("%s: %s - Unable to find the imaginary-image."),
@@ -104,8 +103,7 @@ int main(int argc, char *argv[])
     if ((imagfp =
 	 G_fopen_old_misc("cell_misc", "fftimag", Cellmap_imag,
 			  imagmapset)) == NULL)
-	G_fatal_error(_
-		      ("Unable to open imaginary-image in the cell_misc directory.\nInput map probably wasn't created by i.fft"));
+	G_fatal_error(_("Unable to open imaginary-image in the cell_misc directory.\nInput map probably wasn't created by i.fft"));
 
     /* check command line args for validity */
     if (G_legal_filename(Cellmap_orig) < 0)
@@ -135,8 +133,7 @@ int main(int argc, char *argv[])
     data[0] = (double *)G_malloc((rows * cols) * sizeof(double));
     data[1] = (double *)G_malloc((rows * cols) * sizeof(double));
     if (data[0] == NULL || data[1] == NULL)
-	G_fatal_error(_
-		      ("Insufficent memory for allocation of data structure"));
+	G_fatal_error(_("Insufficent memory for allocation of data structure"));
 
     /* Initialize real & complex components to zero */
     G_message(_("Reading the raster maps..."));

imagery/i.ifft/orig_wind.c

@@ -24,8 +24,7 @@ int get_orig_window(struct Cell_head *hd, char *rmapset, char *imapset)
 	hd->east != tmphd.east ||
 	hd->west != tmphd.west ||
 	hd->ew_res != tmphd.ew_res || hd->ns_res != tmphd.ns_res)
-	G_fatal_error(_
-		      ("The real and imaginary original windows did not match."));
+	G_fatal_error(_("The real and imaginary original windows did not match."));
 
     return 0;
 }

imagery/i.maxlik/invert.c

@@ -25,12 +25,10 @@ int invert_signatures(void)
 	stat = invert(s = &S.sig[c], S.nbands, ik, jk, &det);
 	if (stat != 1) {
 	    if (stat)
-		G_warning(_
-			  ("signature %d is not valid (ill-conditioned) - ignored."),
+		G_warning(_("signature %d is not valid (ill-conditioned) - ignored."),
 			  c + 1);
 	    else
-		G_warning(_
-			  ("signature %d is not valid (singular) - ignored."),
+		G_warning(_("signature %d is not valid (singular) - ignored."),
 			  c + 1);
 
 	    bad = 1;

imagery/i.maxlik/open.c

@@ -23,8 +23,7 @@ int open_files(void)
 
     if (Ref.nfiles <= 1) {
 	if (Ref.nfiles <= 0)
-	    G_fatal_error(_
-			  ("Subgroup [%s] of group [%s] doesn't have any files.\n"
+	    G_fatal_error(_("Subgroup [%s] of group [%s] doesn't have any files.\n"
 			   "The subgroup must have at least 2 files."));
 	else
 	    G_fatal_error(_("Subgroup [%s] of group [%s] only has 1 file.\n"

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

@@ -63,8 +63,7 @@ int write_map(char *name)
 	    G_fatal_error(_("Unable to write row %d"), row);
 
 	if (G_put_raster_row(fd, rast, map_type) < 0) {
-	    G_fatal_error(_
-			  ("Unable to write raster map. You might want to check available disk space and write permissions."));
+	    G_fatal_error(_("Unable to write raster map. You might want to check available disk space and write permissions."));
 	    unlink(temp_name);
 	}
     }

imagery/i.pca/main.c

@@ -203,8 +203,7 @@ set_output_scale(struct Option *scale_opt, int *scale, int *scale_min,
 	    if (*scale_min == 0)
 		*scale = 0;
 	    else {
-		G_warning(_
-			  ("Scale range length should be > 0. Using default values: 0,255"));
+		G_warning(_("Scale range length should be > 0. Using default values: 0,255"));
 		*scale_min = 0;
 		*scale_max = 255;
 	    }
@@ -422,8 +421,7 @@ write_pca(double **eigmat, int *inp_fd, char *out_basename,
 		    if (rowbuf)
 			G_free(rowbuf);
 		    if (!(rowbuf = G_allocate_raster_buf(maptype)))
-			G_fatal_error(_
-				      ("Cannot allocate memory for row buffer"));
+			G_fatal_error(_("Cannot allocate memory for row buffer"));
 
 		    if (G_get_raster_row(inp_fd[j], rowbuf, row, maptype) < 0)
 			G_fatal_error(_("Cannot read raster row [%d]"), row);

imagery/i.rectify/main.c

@@ -116,8 +116,7 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("Group <%s> does not exist"), grp->answer);
 
     if (ref.nfiles <= 0) {
-	G_important_message(_
-			    ("Group <%s> contains no raster maps; run i.group"),
+	G_important_message(_("Group <%s> contains no raster maps; run i.group"),
 			    grp->answer);
 	exit(EXIT_SUCCESS);
     }

imagery/i.smap/bouman/model.c

@@ -35,8 +35,7 @@ void extract_init(struct SigSet *S)
 	    for (b1 = 0; b1 < nbands; b1++)
 		for (b2 = 0; b2 < nbands; b2++) {
 		    if (SubS->R[b1][b2] != SubS->R[b2][b1])
-			G_warning(_
-				  ("\nNonsymetric covariance for class [%d] subclass [%d]."),
+			G_warning(_("\nNonsymetric covariance for class [%d] subclass [%d]."),
 				  m + 1, i + 1);
 
 		    SubS->Rinv[b1][b2] = SubS->R[b1][b2];
@@ -46,8 +45,7 @@ void extract_init(struct SigSet *S)
 	    eigen(SubS->Rinv, lambda, nbands);
 	    for (b1 = 0; b1 < nbands; b1++) {
 		if (lambda[b1] <= 0.0)
-		    G_warning(_
-			      ("Nonpositive eigenvalues for class [%d] subclass [%d]."),
+		    G_warning(_("Nonpositive eigenvalues for class [%d] subclass [%d]."),
 			      m + 1, i + 1);
 	    }
 

imagery/i.smap/shapiro/openfiles.c

@@ -12,8 +12,7 @@ int openfiles(struct parms *parms, struct files *files)
 
 
     if (!I_get_subgroup_ref(parms->group, parms->subgroup, &Ref))
-	G_fatal_error(_
-		      ("Unable to read REF file for subgroup [%s] in group [%s]."),
+	G_fatal_error(_("Unable to read REF file for subgroup [%s] in group [%s]."),
 		      parms->subgroup, parms->group);
 
     if (Ref.nfiles <= 0)

imagery/i.smap/shapiro/read_sig.c

@@ -10,8 +10,7 @@ int read_signatures(struct parms *parms, struct SigSet *S)
     struct Ref Ref;
 
     if (!I_get_subgroup_ref(parms->group, parms->subgroup, &Ref))
-	G_fatal_error(_
-		      ("Unable to read REF file for subgroup [%s] in group [%s]."),
+	G_fatal_error(_("Unable to read REF file for subgroup [%s] in group [%s]."),
 		      parms->subgroup, parms->group);
 
     if (Ref.nfiles <= 0)

imagery/i.zc/main.c

@@ -153,8 +153,7 @@ int main(int argc, char *argv[])
     data[0] = (double *)G_malloc(totsize * sizeof(double));
     data[1] = (double *)G_malloc(totsize * sizeof(double));
     if (data[0] == NULL || data[1] == NULL)
-	G_fatal_error(_
-		      ("Insufficent memory for allocation of data structure"));
+	G_fatal_error(_("Insufficent memory for allocation of data structure"));
 
     /* Initialize real & complex components to zero */
     G_message(_("Initializing data..."));