X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_last.c;h=90da610ffaef42f041de5c98b5d8530efe6a9dc0;hb=2815c8a96b82730e41cebf8a5065e00666c560b8;hp=b9caa64196ca4b59d5ecd57860b6992f9a7ef462;hpb=285da1fa16e80919db972b1d7021c0b4705bedb1;p=rrdtool.git

diff --git a/src/rrd_last.c b/src/rrd_last.c
index b9caa64..90da610 100644
--- 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
  *****************************************************************************
@@ -8,27 +8,32 @@
 
 #include "rrd_tool.h"
 
-time_t
-rrd_last(int argc, char **argv)
+time_t rrd_last(
+    int argc,
+    char **argv)
 {
-    FILE	*in_file;
-    time_t       lastup;
-
-    rrd_t	 rrd;
-
-    if(argc < 2){
+    if (argc < 2) {
         rrd_set_error("please specify an rrd");
-        return(-1);
-    }
-    if(rrd_open(argv[1], &in_file, &rrd, RRD_READONLY)==-1){
-        return(-1);
+        return (-1);
     }
-    lastup = rrd.live_head->last_up;
-    rrd_free(&rrd);
-    fclose(in_file);
-    return(lastup);
+
+    return (rrd_last_r(argv[1]));
 }
- 
 
 
+time_t rrd_last_r(
+    const char *filename)
+{
+    time_t    lastup = -1;
+    rrd_file_t *rrd_file;
+
+    rrd_t     rrd;
 
+    rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
+    if (rrd_file != NULL) {
+        lastup = rrd.live_head->last_up;
+        rrd_close(rrd_file);
+    }
+    rrd_free(&rrd);
+    return (lastup);
+}