diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c
index 120cf17f5baf6136d085fa2d674b87e1a46310ee..42d9c95970a7d09c07d4c62bf290048108686063 100644 (file)
--- a/src/rrd_lastupdate.c
+++ b/src/rrd_lastupdate.c
/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
* Copyright by Florian Forster, 2008
*****************************************************************************
* rrd_lastupdate Get the last datum entered for each DS
return (-1);
}
- if (opt_daemon == NULL)
- {
- char *temp;
-
- temp = getenv (ENV_RRDCACHED_ADDRESS);
- if (temp != NULL)
- {
- opt_daemon = strdup (temp);
- if (opt_daemon == NULL)
- {
- rrd_set_error("strdup failed.");
- return (-1);
- }
- }
- }
-
- if (opt_daemon != NULL)
- {
- status = rrdc_connect (opt_daemon);
- if (status != 0)
- {
- rrd_set_error ("rrdc_connect failed with status %i.", status);
- return (-1);
- }
-
- status = rrdc_flush (argv[optind]);
- if (status != 0)
- {
- rrd_set_error ("rrdc_flush (%s) failed with status %i.",
- argv[optind], status);
- return (-1);
- }
-
- rrdc_disconnect ();
- } /* if (opt_daemon) */
+ status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
+ if (opt_daemon) free (opt_daemon);
+ if (status) return (-1);
status = rrd_lastupdate_r (argv[optind],
&last_update, &ds_count, &ds_names, &last_ds);
rrd_t rrd;
rrd_file_t *rrd_file;
+ rrd_init(&rrd);
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
if (rrd_file == NULL) {
rrd_free(&rrd);