X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_resize.c;h=e6ccaa4d582cc16f69a58224aa59151782df34a4;hb=d38f649c3e9f0dbfbd80a86eb94ef7970e4a376c;hp=9dcfccab95da81afce3aa7a2f421564db69d7535;hpb=fd541595aa5d0c19281fda76907847a93f2cfaec;p=rrdtool.git diff --git a/src/rrd_resize.c b/src/rrd_resize.c index 9dcfcca..e6ccaa4 100644 --- a/src/rrd_resize.c +++ b/src/rrd_resize.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_resize.c Alters size of an RRA ***************************************************************************** @@ -60,7 +60,7 @@ int rrd_resize( rrd_free(&rrdold); return (-1); } - if (LockRRD(rrd_file->fd) != 0) { + if (rrd_lock(rrd_file) != 0) { rrd_set_error("could not lock original RRD"); rrd_free(&rrdold); rrd_close(rrd_file); @@ -82,6 +82,7 @@ int rrd_resize( return (-1); } /* the size of the new file */ + /* yes we are abusing the float cookie for this, aargh */ if ((rrdnew.stat_head = calloc(1, sizeof(stat_head_t))) == NULL) { rrd_set_error("allocating stat_head for new RRD"); rrd_free(&rrdold); @@ -97,7 +98,7 @@ int rrd_resize( rrd_free(&rrdnew); return (-1); } - if (LockRRD(rrd_out_file->fd) != 0) { + if (rrd_lock(rrd_out_file) != 0) { rrd_set_error("could not lock new RRD"); rrd_free(&rrdold); rrd_close(rrd_file);