projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There are two popular variants of the Holt-Winters forecasting method; RRDtool
[rrdtool.git]
/
src
/
rrd_info.c
diff --git
a/src/rrd_info.c
b/src/rrd_info.c
index
4582e2a
..
f1866be
100644
(file)
--- a/
src/rrd_info.c
+++ b/
src/rrd_info.c
@@
-99,17
+99,15
@@
info_t *rrd_info_r(
{
unsigned int i, ii = 0;
rrd_t rrd;
{
unsigned int i, ii = 0;
rrd_t rrd;
- info_t *data, *cd;
+ info_t *data
= NULL
, *cd;
infoval info;
rrd_file_t *rrd_file;
enum cf_en current_cf;
enum dst_en current_ds;
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
infoval info;
rrd_file_t *rrd_file;
enum cf_en current_cf;
enum dst_en current_ds;
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
- if (rrd_file == NULL) {
- return (NULL);
- }
- close(rrd_file->fd);
+ if (rrd_file == NULL)
+ goto err_free;
info.u_str = filename;
cd = info_push(NULL, sprintf_alloc("filename"), RD_I_STR, info);
info.u_str = filename;
cd = info_push(NULL, sprintf_alloc("filename"), RD_I_STR, info);
@@
-136,7
+134,7
@@
info_t *rrd_info_r(
{
char *buffer = NULL;
{
char *buffer = NULL;
- rpn_compact2str((rpn_cdefds_t *) &
(rrd.ds_def[i].par[DS_cdef]),
+ rpn_compact2str((rpn_cdefds_t *) &(rrd.ds_def[i].par[DS_cdef]),
rrd.ds_def, &buffer);
info.u_str = buffer;
cd = info_push(cd,
rrd.ds_def, &buffer);
info.u_str = buffer;
cd = info_push(cd,
@@
-194,6
+192,7
@@
info_t *rrd_info_r(
switch (current_cf) {
case CF_HWPREDICT:
switch (current_cf) {
case CF_HWPREDICT:
+ case CF_MHWPREDICT:
info.u_val = rrd.rra_def[i].par[RRA_hw_alpha].u_val;
cd = info_push(cd, sprintf_alloc("rra[%d].alpha", i), RD_I_VAL,
info);
info.u_val = rrd.rra_def[i].par[RRA_hw_alpha].u_val;
cd = info_push(cd, sprintf_alloc("rra[%d].alpha", i), RD_I_VAL,
info);
@@
-233,6
+232,7
@@
info_t *rrd_info_r(
for (ii = 0; ii < rrd.stat_head->ds_cnt; ii++) {
switch (current_cf) {
case CF_HWPREDICT:
for (ii = 0; ii < rrd.stat_head->ds_cnt; ii++) {
switch (current_cf) {
case CF_HWPREDICT:
+ case CF_MHWPREDICT:
info.u_val =
rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
ii].scratch[CDP_hw_intercept].u_val;
info.u_val =
rrd.cdp_prep[i * rrd.stat_head->ds_cnt +
ii].scratch[CDP_hw_intercept].u_val;
@@
-306,8
+306,9
@@
info_t *rrd_info_r(
}
}
}
}
}
}
- rrd_free(&rrd);
+
rrd_close(rrd_file);
rrd_close(rrd_file);
+ err_free:
+ rrd_free(&rrd);
return (data);
return (data);
-
}
}