port forward of fixes from the stable version of rrd_cgi

[rrdtool.git] / src / rrd_update.c

diff --git a/src/rrd_update.c b/src/rrd_update.c
index ecd5b37..583d9ac 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -1,10 +1,29 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2004
  *****************************************************************************
  * rrd_update.c  RRD Update Function
  *****************************************************************************
  * $Id$
  * $Log$
+ * Revision 1.17  2004/05/26 22:11:12  oetiker
+ * reduce compiler warnings. Many small fixes. -- Mike Slifcak <slif@bellsouth.net>
+ *
+ * Revision 1.16  2004/05/25 20:52:16  oetiker
+ * fix spelling and syntax, especially in messages that are printed -- Mike Slifcak
+ *
+ * Revision 1.15  2004/05/25 20:51:49  oetiker
+ * Update displayed copyright messages to be consistent. -- Mike Slifcak
+ *
+ * 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
  *
@@ -139,7 +158,7 @@ int
 main(int argc, char **argv){
         rrd_update(argc,argv);
         if (rrd_test_error()) {
-                printf("RRDtool 1.1.x  Copyright 1997-2000 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
+                printf("RRDtool 1.1.x  Copyright (C) 1997-2004 by Tobias Oetiker <tobi@oetiker.ch>\n\n"
                         "Usage: rrdupdate filename\n"
                         "\t\t\t[--template|-t ds-name:ds-name:...]\n"
                         "\t\t\ttime|N:value[:value...]\n\n"
@@ -459,7 +478,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 +643,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;
                             }
@@ -634,7 +653,7 @@ _rrd_update(char *filename, char *template, int argc, char **argv,
                        }
                       pdp_new[i]= rrd_diff(updvals[i+1],rrd.pdp_prep[i].last_ds);
                       if(dst_idx == DST_COUNTER) {
-                         /* simple overflow catcher sugestet by andres kroonmaa */
+                         /* simple overflow catcher suggested by Andres Kroonmaa */
                          /* this will fail terribly for non 32 or 64 bit counters ... */
                          /* are there any others in SNMP land ? */
                          if (pdp_new[i] < (double)0.0 ) 
@@ -1216,10 +1235,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",
@@ -1426,31 +1444,31 @@ int
 LockRRD(FILE *rrdfile)
 {
     int        rrd_fd;         /* File descriptor for RRD */
-    int                        stat;
+    int        rcstat;
 
     rrd_fd = fileno(rrdfile);
 
        {
 #ifndef WIN32    
-               struct flock    lock;
+    struct flock       lock;
     lock.l_type = F_WRLCK;    /* exclusive write lock */
     lock.l_len = 0;          /* whole file */
     lock.l_start = 0;        /* start of file */
     lock.l_whence = SEEK_SET;   /* end of file */
 
-    stat = fcntl(rrd_fd, F_SETLK, &lock);
+    rcstat = fcntl(rrd_fd, F_SETLK, &lock);
 #else
-               struct _stat st;
+    struct _stat st;
 
-               if ( _fstat( rrd_fd, &st ) == 0 ) {
-                       stat = _locking ( rrd_fd, _LK_NBLCK, st.st_size );
-               } else {
-                       stat = -1;
-               }
+    if ( _fstat( rrd_fd, &st ) == 0 ) {
+           rcstat = _locking ( rrd_fd, _LK_NBLCK, st.st_size );
+    } else {
+           rcstat = -1;
+    }
 #endif
        }
 
-    return(stat);
+    return(rcstat);
 }