X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=program%2Fsrc%2Frrd_last.c;h=6c2b88c6215840a51c7787f40203599ce558a97b;hb=a224e5b34d0b3c3c2ee6186f74c3000e31ccd7fe;hp=78ba5a360823dfa16d235fe1073cbdc9a0a62969;hpb=3af98cc6615b90380900a788afa1ade52d6954cb;p=rrdtool-all.git

diff --git a/program/src/rrd_last.c b/program/src/rrd_last.c
index 78ba5a36..6c2b88c6 100644
--- a/program/src/rrd_last.c
+++ b/program/src/rrd_last.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2.99907080300  Copyright by Tobi Oetiker, 1997-2007
  *****************************************************************************
  * rrd_last.c
  *****************************************************************************
@@ -8,37 +8,32 @@
 
 #include "rrd_tool.h"
 
-time_t
-rrd_last(int argc, char **argv)
+time_t rrd_last(
+    int argc,
+    char **argv)
 {
-    time_t       lastup;
-
-    if(argc < 2){
+    if (argc < 2) {
         rrd_set_error("please specify an rrd");
-        return(-1);
+        return (-1);
     }
 
-    lastup = rrd_last_r(argv[1]);
-
-    return(lastup);
+    return (rrd_last_r(argv[1]));
 }
- 
 
-time_t
-rrd_last_r(char *filename)
+
+time_t rrd_last_r(
+    const char *filename)
 {
-    FILE	*in_file;
-    time_t       lastup;
+    time_t    lastup = -1;
+    rrd_file_t *rrd_file;
 
-    rrd_t	 rrd;
+    rrd_t     rrd;
 
-    if(rrd_open(filename, &in_file, &rrd, RRD_READONLY)==-1){
-        return(-1);
+    rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
+    if (rrd_file != NULL) {
+        lastup = rrd.live_head->last_up;
+        rrd_close(rrd_file);
     }
-    lastup = rrd.live_head->last_up;
     rrd_free(&rrd);
-    fclose(in_file);
-    return(lastup);
+    return (lastup);
 }
-
-