projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* replaced strtok with strtok_r for thread safety
[rrdtool.git]
/
src
/
rrd_restore.c
diff --git
a/src/rrd_restore.c
b/src/rrd_restore.c
index
1164adb
..
d3a2c8a
100644
(file)
--- a/
src/rrd_restore.c
+++ b/
src/rrd_restore.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.2.
23
Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.2.
99907080300
Copyright by Tobi Oetiker, 1997-2007
*****************************************************************************
* rrd_restore.c creates new rrd from data dumped by rrd_dump.c
*****************************************************************************/
*****************************************************************************
* rrd_restore.c creates new rrd from data dumped by rrd_dump.c
*****************************************************************************/
@@
-224,7
+224,7
@@
int xml2rrd(
return -1;
}
/* make sure we output the right version only go over 3 if input is over 3 too */
return -1;
}
/* make sure we output the right version only go over 3 if input is over 3 too */
- if (input_version > 3
)
{
+ if (input_version > 3
)
{
strcpy(rrd->stat_head->version, RRD_VERSION);
} else {
strcpy(rrd->stat_head->version, RRD_VERSION3);
strcpy(rrd->stat_head->version, RRD_VERSION);
} else {
strcpy(rrd->stat_head->version, RRD_VERSION3);
@@
-383,6
+383,11
@@
int xml2rrd(
read_tag(&ptr2, "seasonal_smooth_idx", "%lu",
&(rrd->rra_def[rra_index].
par[RRA_seasonal_smooth_idx].u_cnt));
read_tag(&ptr2, "seasonal_smooth_idx", "%lu",
&(rrd->rra_def[rra_index].
par[RRA_seasonal_smooth_idx].u_cnt));
+ if (atoi(rrd->stat_head->version) >= 4) {
+ read_tag(&ptr2, "smoothing_window", "%lf",
+ &(rrd->rra_def[rra_index].
+ par[RRA_seasonal_smoothing_window].u_val));
+ }
read_tag(&ptr2, "dependent_rra_idx", "%lu",
&(rrd->rra_def[rra_index].
par[RRA_dependent_rra_idx].u_cnt));
read_tag(&ptr2, "dependent_rra_idx", "%lu",
&(rrd->rra_def[rra_index].
par[RRA_dependent_rra_idx].u_cnt));