X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=5fcb4404e3a369c0305cde7e87653b34dbab8c93;hb=298b318acaf1147474ab9e97cac37c3608660efd;hp=c4243557e6dd3d1816781b1c84d54b9131647b2d;hpb=2b821e60503b38bda3a39c26ca351136e19c9ead;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index c424355..5fcb440 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -360,6 +360,8 @@ int main(int argc, char *argv[])
     return 0;
 }
 
+/* HandleInputLine is NOT thread safe - due to readdir issues,
+   resolving them portably is not really simple. */
 int HandleInputLine(int argc, char **argv, FILE* out)
 {
 #if defined(HAVE_OPENDIR) && defined (HAVE_READDIR)
@@ -505,7 +507,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
     else if (strcmp("update", argv[1]) == 0)
 	rrd_update(argc-1, &argv[1]);
     else if (strcmp("fetch", argv[1]) == 0) {
-	time_t        start,end;
+	time_t        start,end, ti;
 	unsigned long step, ds_cnt,i,ii;
 	rrd_value_t   *data,*datai;
 	char          **ds_namv;
@@ -515,8 +517,8 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	    for (i = 0; i<ds_cnt;i++)
 	        printf("%14s",ds_namv[i]);
 	    printf ("\n\n");
-	    for (i = start+step; i <= end; i += step){
-	        printf("%10lu:", i);
+	    for (ti = start+step; ti <= end; ti += step){
+	        printf("%10lu:", ti);
 	        for (ii = 0; ii < ds_cnt; ii++)
 		    printf(" %0.10e", *(datai++));
 	        printf("\n");
@@ -528,8 +530,8 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	}
     } else if (strcmp("xport", argv[1]) == 0) {
 	int xxsize;
-	unsigned long int i = 0, j = 0;
-	time_t        start,end;
+	unsigned long int j = 0;
+	time_t        start,end, ti;
 	unsigned long step, col_cnt,row_cnt;
 	rrd_value_t   *data,*ptr;
 	char          **legend_v;
@@ -555,9 +557,9 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	  printf("    </%s>\n", LEGEND_TAG);
 	  printf("  </%s>\n", META_TAG);
 	  printf("  <%s>\n", DATA_TAG);
-	  for (i = start+step; i <= end; i += step) {
+	  for (ti = start+step; ti <= end; ti += step) {
 	    printf ("    <%s>", DATA_ROW_TAG);
-	    printf ("<%s>%lu</%s>", COL_TIME_TAG, i, COL_TIME_TAG);
+	    printf ("<%s>%lu</%s>", COL_TIME_TAG, ti, COL_TIME_TAG);
 	    for (j = 0; j < col_cnt; j++) {
 	      rrd_value_t newval = DNAN;
 	      newval = *ptr;