X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_update.c;h=583d9acf0bcd0540de115bf3093a42fd4b5f1379;hb=e44c4e2927897b0125873cdf198df7c19aabf79f;hp=957cf773b83fb1dcadc3a5f25971bba25b231e10;hpb=05772c3f06f0381e86fd492860d5ebc441641a8c;p=rrdtool.git diff --git a/src/rrd_update.c b/src/rrd_update.c index 957cf77..583d9ac 100644 --- a/src/rrd_update.c +++ b/src/rrd_update.c @@ -5,6 +5,12 @@ ***************************************************************************** * $Id$ * $Log$ + * Revision 1.17 2004/05/26 22:11:12 oetiker + * reduce compiler warnings. Many small fixes. -- Mike Slifcak + * + * 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 * @@ -647,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 ) @@ -1438,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); }