/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_dump Display a RRD
*****************************************************************************
#include "rrd_rpncalc.h"
#include "rrd_client.h"
-#ifdef HAVE_LOCALE_H
#include <locale.h>
-#endif
#if !(defined(NETWARE) || defined(WIN32))
extern char *tzname[2];
size_t len,
void *user);
+int rrd_dump_opt_r(
+ const char *filename,
+ char *outname,
+ int opt_noheader);
int rrd_dump_cb_r(
const char *filename,
return (-1);
}
-#ifdef HAVE_SETLOCALE
- old_locale = setlocale(LC_NUMERIC, "C");
-#endif
+ old_locale = setlocale(LC_NUMERIC, NULL);
+ setlocale(LC_NUMERIC, "C");
+
if (opt_header == 1) {
CB_PUTS("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
# error "Need strftime"
#endif
CB_FMTS("\t<lastupdate>%lld</lastupdate> <!-- %s -->\n\n",
- (long long) rrd.live_head->last_up, somestring);
+ (long long int) rrd.live_head->last_up, somestring);
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
CB_PUTS("\t<ds>\n");
#else
# error "Need strftime"
#endif
- CB_FMTS("\t\t\t<!-- %s / %lld --> <row>", somestring, (long long) now);
+ CB_FMTS("\t\t\t<!-- %s / %lld --> <row>", somestring, (long long int) now);
for (iii = 0; iii < rrd.stat_head->ds_cnt; iii++) {
rrd_read(rrd_file, &my_cdp, sizeof(rrd_value_t) * 1);
if (isnan(my_cdp)) {
rrd_free(&rrd);
-#ifdef HAVE_SETLOCALE
setlocale(LC_NUMERIC, old_locale);
-#endif
return rrd_close(rrd_file);