X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Frrd_open.c;h=cf663ed3bf76c0e82ccb56b23148ac79c5206bda;hb=01399dbbb2b67d6fbe8d22eac1a1482f8efee461;hp=1a3496d444564d79ccfd6a9e4a82d88882a8db7b;hpb=807a360d0f655237d1278d4ccff833059992270b;p=rrdtool.git diff --git a/src/rrd_open.c b/src/rrd_open.c index 1a3496d..cf663ed 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,10 +1,20 @@ /***************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 ***************************************************************************** * rrd_open.c Open an RRD File ***************************************************************************** * $Id$ * $Log$ + * Revision 1.4 2002/02/01 20:34:49 oetiker + * fixed version number and date/time + * + * Revision 1.3 2001/03/04 13:01:55 oetiker + * Aberrant Behavior Detection support. A brief overview added to rrdtool.pod. + * Major updates to rrd_update.c, rrd_create.c. Minor update to other core files. + * This is backwards compatible! But new files using the Aberrant stuff are not readable + * by old rrdtool versions. See http://cricket.sourceforge.net/aberrant/rrd_hw.htm + * -- Jake Brutlag + * * Revision 1.2 2001/03/04 10:29:20 oetiker * fixed filedescriptor leak * -- Mike Franusich @@ -45,6 +55,15 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) rrd_set_error("opening '%s': %s",file_name, strerror(errno)); return (-1); } +/* + if (rdwr == RRD_READWRITE) + { + if (setvbuf((*in_file),NULL,_IONBF,2)) { + rrd_set_error("failed to disable the stream buffer\n"); + return (-1); + } + } +*/ #define MYFREAD(MYVAR,MYVART,MYCNT) \ if ((MYVAR = malloc(sizeof(MYVART) * MYCNT)) == NULL) {\ @@ -63,7 +82,7 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) fclose(*in_file); return(-1);} - if (strncmp(rrd->stat_head->version,RRD_VERSION,5) != 0){ + if (atoi(rrd->stat_head->version) > atoi(RRD_VERSION)){ rrd_set_error("can't handle RRD file version %s", rrd->stat_head->version); free(rrd->stat_head);