*****************************************************************************
* $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
*
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);
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;
}
/* 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",