X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=cfa524afb71f0fcc78c91930b355b194fe10aab1;hb=5a7eb5b62b485b61ddb80a40ef22f4337cf2289f;hp=443a1a5652a50c01a023a47c6fb51773241d364d;hpb=59ffebeb1600f4bd7b0ff79fb2bc08941d3a0195;p=rrdtool.git diff --git a/src/rrd_open.c b/src/rrd_open.c index 443a1a5..cfa524a 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,10 +1,13 @@ /***************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2.5 Copyright by Tobi Oetiker, 1997-2005 ***************************************************************************** * rrd_open.c Open an RRD File ***************************************************************************** * $Id$ * $Log$ + * Revision 1.10 2004/05/26 22:11:12 oetiker + * reduce compiler warnings. Many small fixes. -- Mike Slifcak + * * Revision 1.9 2003/04/29 21:56:49 oetiker * readline in rrd_open.c reads the file in 8 KB blocks, and calls realloc for * each block. realloc is very slow in Mac OS X for huge blocks, e.g. when @@ -66,7 +69,7 @@ /* positioned to the first cdp in the first rra */ int -rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) +rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) { @@ -75,17 +78,9 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) rrd_init(rrd); if (rdwr == RRD_READONLY) { -#ifndef WIN32 - mode = "r"; -#else mode = "rb"; -#endif } else { -#ifndef WIN32 - mode = "r+"; -#else mode = "rb+"; -#endif } if (((*in_file) = fopen(file_name,mode)) == NULL ){ @@ -190,7 +185,7 @@ void rrd_freemem(void *mem) if (mem) free(mem); } -int readfile(char *file_name, char **buffer, int skipfirst){ +int readfile(const char *file_name, char **buffer, int skipfirst){ long writecnt=0,totalcnt = MEMBLK; long offset = 0; FILE *input=NULL;