projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove HAVE_LOCALE_H and HAVE_TIME_H and HAVE_SETLOCALE since they have not been...
[rrdtool.git]
/
src
/
rrd_dump.c
diff --git
a/src/rrd_dump.c
b/src/rrd_dump.c
index
a206230
..
3b7867f
100644
(file)
--- a/
src/rrd_dump.c
+++ b/
src/rrd_dump.c
@@
-45,9
+45,7
@@
#include "rrd_rpncalc.h"
#include "rrd_client.h"
#include "rrd_rpncalc.h"
#include "rrd_client.h"
-#ifdef HAVE_LOCALE_H
#include <locale.h>
#include <locale.h>
-#endif
#if !(defined(NETWARE) || defined(WIN32))
extern char *tzname[2];
#if !(defined(NETWARE) || defined(WIN32))
extern char *tzname[2];
@@
-59,6
+57,10
@@
size_t rrd_dump_opt_cb_fileout(
size_t len,
void *user);
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,
int rrd_dump_cb_r(
const char *filename,
@@
-101,9
+103,8
@@
int rrd_dump_cb_r(
return (-1);
}
return (-1);
}
-#ifdef HAVE_SETLOCALE
old_locale = setlocale(LC_NUMERIC, "C");
old_locale = setlocale(LC_NUMERIC, "C");
-#endif
+
if (opt_header == 1) {
CB_PUTS("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
if (opt_header == 1) {
CB_PUTS("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
@@
-447,9
+448,7
@@
int rrd_dump_cb_r(
rrd_free(&rrd);
rrd_free(&rrd);
-#ifdef HAVE_SETLOCALE
setlocale(LC_NUMERIC, old_locale);
setlocale(LC_NUMERIC, old_locale);
-#endif
return rrd_close(rrd_file);
return rrd_close(rrd_file);