Fix some instances of printing of off_t and size_t

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

imagery/i.segment/iseg.h

@@ -22,10 +22,13 @@
 
 #ifdef HAVE_LONG_LONG_INT
 #define LARGEINT long long
+#define PRI_LONG "lld"
 #elif defined HAVE_LARGEFILES
 #define LARGEINT off_t
+#define PRI_LONG PRI_OFF_T
 #else
 #define LARGEINT long
+#define PRI_LONG "ld"
 #endif
 
 /* methods */

imagery/i.segment/mean_shift.c

@@ -209,7 +209,7 @@ int mean_shift(struct globals *globals)
 	G_message(_("Range bandwidth: %g"), hspec);
     }
 
-    G_debug(4, "Starting to process %ld candidate cells",
+    G_debug(4, "Starting to process %"PRI_LONG" candidate cells",
 	    globals->candidate_count);
 
     t = 0;
@@ -392,7 +392,7 @@ int mean_shift(struct globals *globals)
 	    }
 	}
 	G_percent(1, 1, 1);
-	G_message(_("Changes > threshold: %d, largest change: %g"), n_changes, sqrt(maxdiff2));
+	G_message(_("Changes > threshold: %"PRI_LONG", largest change: %g"), n_changes, sqrt(maxdiff2));
     }
     if (n_changes > 1)
 	G_message(_("Mean shift stopped at %d due to reaching max iteration limit, more changes may be possible"), t);

imagery/i.segment/open_files.c

@@ -550,7 +550,7 @@ static int manage_memory(int srows, int scols, struct globals *globals)
 		segs_mb = 10;
 	}
 
-	G_verbose_message(_("Regions with at least %d cells are stored in memory"),
+	G_verbose_message(_("Regions with at least %"PRI_LONG" cells are stored in memory"),
 			  globals->min_reg_size);
     }
 

imagery/i.segment/region_growing.c

@@ -270,7 +270,7 @@ int region_growing(struct globals *globals)
 	    }
 	}
 
-	G_debug(4, "Starting to process %ld candidate cells",
+	G_debug(4, "Starting to process %"PRI_LONG" candidate cells",
 		globals->candidate_count);
 
 	/*process candidate cells */
@@ -580,7 +580,7 @@ int region_growing(struct globals *globals)
 	    }
 	}
 
-	G_debug(4, "Starting to process %ld candidate cells",
+	G_debug(4, "Starting to process %"PRI_LONG" candidate cells",
 		globals->candidate_count);
 
 	/* process candidate cells */
@@ -985,7 +985,7 @@ int update_band_vals(int row, int col, struct reg_stats *rs,
     G_debug(4, "update_band_vals()");
 
     if (rs->count >= globals->min_reg_size) {
-	G_fatal_error(_("Region stats should go in tree, %d >= %d"),
+	G_fatal_error(_("Region stats should go in tree, %d >= %"PRI_LONG""),
 	              rs->count, globals->min_reg_size);
     }
 

lib/gis/basename.c

@@ -88,12 +88,12 @@ char *G_double_to_basename_format(double number,
     char *result;
 
     if (ndigits != 0){
-        sprintf(intfmt, "%%0%ud", ndigits);
+        sprintf(intfmt, "%%0%zu", ndigits);
     }
     sprintf(intstr, intfmt, (int)integer);
 
     if (ndecimals != 0){
-        sprintf(decfmt, "_%%0%ud", ndecimals);
+        sprintf(decfmt, "_%%0%zu", ndecimals);
         decimal = ((number - integer) * pow(10., (double)ndecimals));
         sprintf(decstr, decfmt, (int)decimal);
     }

lib/segment/format.c

@@ -112,7 +112,7 @@ static int seg_format(int fd, off_t nrows, off_t ncols,
     int spr, size;
 
     if (nrows <= 0 || ncols <= 0 || len <= 0 || srows <= 0 || scols <= 0) {
-	G_warning("Segment_format(fd,%lld,%lld,%d,%d,%d): illegal value(s)",
+	G_warning("Segment_format(fd,%"PRI_OFF_T",%"PRI_OFF_T",%d,%d,%d): illegal value(s)",
 		  nrows, ncols, srows, scols, len);
 	return -3;
     }

raster/r.out.mat/main.c

@@ -294,7 +294,7 @@ int main(int argc, char *argv[])
 	G_calloc((Rast_window_rows() + 1) * (Rast_window_cols() + 1),
 		 Rast_cell_size(map_type));
 
-    G_debug(1, "mem alloc is %d bytes\n",	/* I think _cols()+1 is unneeded? */
+    G_debug(1, "mem alloc is %zu bytes\n",	/* I think _cols()+1 is unneeded? */
 	    Rast_cell_size(map_type) * (Rast_window_rows() +
 				       1) * (Rast_window_cols() + 1));
 

raster/r.recode/read_rules.c

@@ -68,7 +68,7 @@ int read_rules(FILE * fp)
 	if (!G_getl2(buf, 1024, fp))
 	    return nrules;
 
-	G_debug(5, "buf = [%s], strlen(buf)=%d", buf, strlen(buf));
+	G_debug(5, "buf = [%s], strlen(buf)=%zu", buf, strlen(buf));
 
 	for (n = 0; buf[n]; n++)
 	    if (buf[n] == ',')

raster/r.stream.extract/close.c

@@ -206,7 +206,7 @@ int close_streamvect(char *stream_vect)
     /* stream nodes */
     for (i = 1; i <= n_stream_nodes; i++) {
 
-	sprintf(buf, "insert into %s values ( %lld, \'%s\', %d, %d )",
+	sprintf(buf, "insert into %s values ( %"PRI_OFF_T", \'%s\', %d, %d )",
 		Fi->table, i,
 		(stream_node[i].n_trib > 0 ? "intermediate" : "start"),
 		(stream_node[i].n_trib > 0), network_id[i]);

raster/r.stream.extract/do_astar.c

@@ -59,12 +59,12 @@ int do_astar(void)
     while (heap_size > 0) {
 	G_percent(count++, n_points, 1);
 	if (count > n_points)
-	    G_fatal_error(_("%lld surplus points"),
+	    G_fatal_error(_("%"PRI_OFF_T" surplus points"),
 	                  heap_size);
 
 	if (heap_size > n_points)
 	    G_fatal_error
-		(_("Too many points in heap %lld, should be %lld"),
+		(_("Too many points in heap %"PRI_OFF_T", should be %"PRI_OFF_T""),
 		 heap_size, n_points);
 
 	heap_p = heap_drop();

raster/r.stream.extract/init_search.c

@@ -114,9 +114,9 @@ int init_search(int depr_fd)
 	G_free(depr_buf);
     }
 
-    G_debug(1, "%lld edge cells", heap_size - n_depr_cells);
+    G_debug(1, "%"PRI_OFF_T" edge cells", heap_size - n_depr_cells);
     if (n_depr_cells)
-	G_debug(1, "%lld cells in depressions", n_depr_cells);
+	G_debug(1, "%"PRI_OFF_T" cells in depressions", n_depr_cells);
 
     return 1;
 }

raster/r.stream.extract/load.c

@@ -167,7 +167,7 @@ int load_maps(int ele_fd, int acc_fd)
 	G_free(acc_buf);
     }
     
-    G_debug(1, "%lld non-NULL cells", n_points);
+    G_debug(1, "%"PRI_OFF_T" non-NULL cells", n_points);
 
     return (n_points > 0);
 }

raster/r.stream.extract/streams.c

@@ -69,7 +69,7 @@ static int continue_stream(CELL stream_id, int r_max, int c_max,
 
 	/* debug */
 	if (n_stream_nodes != *stream_no)
-	    G_warning(_("Stream_no %d and n_stream_nodes %lld out of sync"),
+	    G_warning(_("Stream_no %d and n_stream_nodes %"PRI_OFF_T" out of sync"),
 		      *stream_no, n_stream_nodes);
 
 	stream_node[*stream_no].n_alloc += 2;
@@ -665,7 +665,7 @@ int extract_streams(double threshold, double mont_exp, int internal_acc)
 
 	    /* debug */
 	    if (n_stream_nodes != stream_no)
-		G_warning(_("Stream_no %d and n_stream_nodes %lld out of sync"),
+		G_warning(_("Stream_no %d and n_stream_nodes %"PRI_OFF_T" out of sync"),
 			  stream_no, n_stream_nodes);
 	}
 
@@ -697,7 +697,7 @@ int extract_streams(double threshold, double mont_exp, int internal_acc)
     }
     G_percent(1, 1, 2);
     if (workedon)
-	G_warning(_("MFD: A * path already processed when setting drainage direction: %lld of %lld cells"),
+	G_warning(_("MFD: A * path already processed when setting drainage direction: %"PRI_OFF_T" of %"PRI_OFF_T" cells"),
 		  workedon, n_points);
 
     G_free(dist_to_nbr);
@@ -705,8 +705,8 @@ int extract_streams(double threshold, double mont_exp, int internal_acc)
     G_free(ele_nbr);
     G_free(flag_nbr);
 
-    G_debug(1, "%lld outlets", n_outlets);
-    G_debug(1, "%lld nodes", n_stream_nodes);
+    G_debug(1, "%"PRI_OFF_T" outlets", n_outlets);
+    G_debug(1, "%"PRI_OFF_T" nodes", n_stream_nodes);
     G_debug(1, "%d streams", stream_no);
 
     return 1;

raster/r.stream.extract/thin.c

@@ -166,7 +166,7 @@ int thin_streams(void)
 
     G_free(nodestack);
     
-    G_verbose_message(_("%d of %lld stream segments were thinned"), n_thinned, n_stream_nodes);
+    G_verbose_message(_("%d of %"PRI_OFF_T" stream segments were thinned"), n_thinned, n_stream_nodes);
 
     return 1;
 }