projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
its filename not filtname
[rrdtool.git]
/
src
/
rrd_fetch_libdbi.c
diff --git
a/src/rrd_fetch_libdbi.c
b/src/rrd_fetch_libdbi.c
index
0e8bc93
..
2c4c722
100644
(file)
--- a/
src/rrd_fetch_libdbi.c
+++ b/
src/rrd_fetch_libdbi.c
@@
-1,4
+1,5
@@
#include "rrd_tool.h"
#include "rrd_tool.h"
+#include "unused.h"
#include <dbi/dbi.h>
#include <time.h>
#include <dbi/dbi.h>
#include <time.h>
@@
-365,7
+366,7
@@
static int _inline_unescape (char* string) {
int
rrd_fetch_fn_libdbi(
const char *filename, /* name of the rrd */
int
rrd_fetch_fn_libdbi(
const char *filename, /* name of the rrd */
- enum cf_en
cf_idx __attribute__((unused)
), /* consolidation function */
+ enum cf_en
UNUSED(cf_idx
), /* consolidation function */
time_t *start,
time_t *end, /* which time frame do you want ?
* will be changed to represent reality */
time_t *start,
time_t *end, /* which time frame do you want ?
* will be changed to represent reality */
@@
-400,6
+401,7
@@
rrd_fetch_fn_libdbi(
char where[10240];
table_help.conn=NULL;
table_help.where=where;
char where[10240];
table_help.conn=NULL;
table_help.where=where;
+ table_help.filename=filename;
/* some loop variables */
int i=0;
/* some loop variables */
int i=0;
@@
-563,7
+565,7
@@
rrd_fetch_fn_libdbi(
}
/* allocate memory for resultset (with the following columns: min,avg,max,count,sigma) */
}
/* allocate memory for resultset (with the following columns: min,avg,max,count,sigma) */
- i=
rows
* sizeof(rrd_value_t)*(*ds_cnt);
+ i=
(rows+1)
* sizeof(rrd_value_t)*(*ds_cnt);
if (((*data) = malloc(i))==NULL){
/* and return error */
rrd_set_error("malloc failed for %i bytes",i);
if (((*data) = malloc(i))==NULL){
/* and return error */
rrd_set_error("malloc failed for %i bytes",i);