* progress in moving all the fileaccess over to a wrapper system that can do fd based...

[rrdtool.git] / src / rrd_last.c

diff --git a/src/rrd_last.c b/src/rrd_last.c
index 78ba5a3..0f9ab9b 100644 (file)
--- a/src/rrd_last.c
+++ b/src/rrd_last.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2.23  Copyright by Tobi Oetiker, 1997-2007
  *****************************************************************************
  * rrd_last.c
  *****************************************************************************
@@ -11,33 +11,30 @@
 time_t
 rrd_last(int argc, char **argv)
 {
-    time_t       lastup;
-
     if(argc < 2){
         rrd_set_error("please specify an rrd");
         return(-1);
     }
 
-    lastup = rrd_last_r(argv[1]);
-
-    return(lastup);
+    return( rrd_last_r(argv[1]) );
 }
  
 
 time_t
-rrd_last_r(char *filename)
+rrd_last_r(const char *filename)
 {
-    FILE       *in_file;
     time_t       lastup;
+    rrd_file_t*        rrd_file;
 
     rrd_t       rrd;
 
-    if(rrd_open(filename, &in_file, &rrd, RRD_READONLY)==-1){
+    rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
+    if (rrd_file == NULL)
         return(-1);
-    }
+
     lastup = rrd.live_head->last_up;
     rrd_free(&rrd);
-    fclose(in_file);
+    rrd_close(rrd_file);
     return(lastup);
 }