prepare for the release of rrdtool-1.3rc7

[rrdtool.git] / src / rrd_last.c

diff --git a/src/rrd_last.c b/src/rrd_last.c
index 99ff125..0429712 100644 (file)
--- a/src/rrd_last.c
+++ b/src/rrd_last.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.23  Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3rc7  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_last.c
  *****************************************************************************
@@ -24,17 +24,16 @@ time_t rrd_last(
 time_t rrd_last_r(
     const char *filename)
 {
-    time_t    lastup;
+    time_t    lastup = -1;
     rrd_file_t *rrd_file;
 
     rrd_t     rrd;
 
     rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
-    if (rrd_file == NULL)
-        return (-1);
-
-    lastup = rrd.live_head->last_up;
+    if (rrd_file != NULL) {
+        lastup = rrd.live_head->last_up;
+        rrd_close(rrd_file);
+    }
     rrd_free(&rrd);
-    rrd_close(rrd_file);
     return (lastup);
 }