X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_lastupdate.c;h=abba2773dab3139d00fd4abd5d98071194f764b9;hb=818549a636c390fb4a8390a7e2195a52293cd56b;hp=af0b4a46b82d19dd2a7b93f6f4dc45c0094f721f;hpb=fbe390e15d3484315efe5802577249c8959e3556;p=rrdtool.git diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c index af0b4a4..abba277 100644 --- a/src/rrd_lastupdate.c +++ b/src/rrd_lastupdate.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.21 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.2.23 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_lastupdate Get the last datum entered for each DS *****************************************************************************/ @@ -13,8 +13,8 @@ rrd_lastupdate(int argc, char **argv, time_t *last_update, unsigned long *ds_cnt, char ***ds_namv, char ***last_ds) { unsigned long i=0; char *filename; - FILE *in_file; rrd_t rrd; + rrd_file_t* rrd_file; if(argc < 2){ rrd_set_error("please specify an rrd"); @@ -22,10 +22,9 @@ rrd_lastupdate(int argc, char **argv, time_t *last_update, } filename = argv[1]; - if(rrd_open(filename,&in_file,&rrd, RRD_READONLY)==-1){ + rrd_file = rrd_open(filename, &rrd, RRD_READONLY); + if (rrd_file == NULL) return(-1); - } - fclose(in_file); *last_update=rrd.live_head->last_up; *ds_cnt = rrd.stat_head->ds_cnt; @@ -50,5 +49,6 @@ rrd_lastupdate(int argc, char **argv, time_t *last_update, } rrd_free(&rrd); + rrd_close(rrd_file); return(0); }