X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_update.c;h=de708df7564ff9fab0f6c30f6e4686c0b71d3f2a;hb=0e35f35b43f96e2a805b2c4d73c0b5ccf5361975;hp=ecd5b37066678df22e4b4751d4d6a55e0b87a6b0;hpb=3919b6d8c40073f47fc37424d0c022752ce85f29;p=rrdtool.git

diff --git a/src/rrd_update.c b/src/rrd_update.c
index ecd5b37..de708df 100644
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -5,6 +5,16 @@
  *****************************************************************************
  * $Id$
  * $Log$
+ * Revision 1.14  2003/11/11 19:46:21  oetiker
+ * replaced time_value with rrd_time_value as MacOS X introduced a struct of that name in their standard headers
+ *
+ * Revision 1.13  2003/11/11 19:38:03  oetiker
+ * rrd files should NOT change size ever ... bulk update code wa buggy.
+ * -- David M. Grimes <dgrimes@navisite.com>
+ *
+ * Revision 1.12  2003/09/04 13:16:12  oetiker
+ * should not assigne but compare ... grrrrr
+ *
  * Revision 1.11  2003/09/02 21:58:35  oetiker
  * be pickier about what we accept in rrd_update. Complain if things do not work out
  *
@@ -459,7 +469,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv,
 	char *p;
 	char *parsetime_error = NULL;
 	enum {atstyle, normal} timesyntax;
-	struct time_value ds_tv;
+	struct rrd_time_value ds_tv;
         if (stepper == NULL){
                 rrd_set_error("failed duplication argv entry");
                 free(updvals);
@@ -624,7 +634,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv,
 		case DST_DERIVE:
 		    if(rrd.pdp_prep[i].last_ds[0] != 'U'){
                       for(ii=0;updvals[i+1][ii] != '\0';ii++){
-                            if(updvals[i+1][ii] < '0' || updvals[i+1][ii] > '9' || (ii=0 && updvals[i+1][ii] == '-')){
+                            if(updvals[i+1][ii] < '0' || updvals[i+1][ii] > '9' || (ii==0 && updvals[i+1][ii] == '-')){
                                  rrd_set_error("not a simple integer: '%s'",updvals[i+1]);
                                  break;
                             }
@@ -1216,10 +1226,9 @@ _rrd_update(char *filename, char *template, int argc, char **argv,
 
 		/* write other rows of the bulk update, if any */
 		scratch_idx = CDP_secondary_val;
-		for ( ; rra_step_cnt[i] > 1; 
-		     rra_step_cnt[i]--, rrd.rra_ptr[i].cur_row++)
+               for ( ; rra_step_cnt[i] > 1; rra_step_cnt[i]--)
 		{
-		   if (rrd.rra_ptr[i].cur_row == rrd.rra_def[i].row_cnt)
+                  if (++rrd.rra_ptr[i].cur_row == rrd.rra_def[i].row_cnt)
 		   {
 #ifdef DEBUG
               fprintf(stderr,"Wraparound for RRA %s, %lu updates left\n",