projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix arrow locations
[rrdtool.git]
/
src
/
rrd_info.c
diff --git
a/src/rrd_info.c
b/src/rrd_info.c
index
d0d9db5
..
fe65aca
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);
@@
-306,8
+304,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);
-
}
}