projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The "$^" variable is GNU make-specific, and fails to compile under
[rrdtool.git]
/
src
/
rrd_xport.c
diff --git
a/src/rrd_xport.c
b/src/rrd_xport.c
index
488c24c
..
cceefe2
100644
(file)
--- a/
src/rrd_xport.c
+++ b/
src/rrd_xport.c
@@
-128,7
+128,7
@@
rrd_xport(int argc, char **argv, int *xsize,
char varname[30],*rpnex;
gdes_alloc(&im);
if(sscanf(argv[i],"%10[A-Z0-9]:%n",symname,&argstart)==1){
char varname[30],*rpnex;
gdes_alloc(&im);
if(sscanf(argv[i],"%10[A-Z0-9]:%n",symname,&argstart)==1){
- if((im.gdes[im.gdes_c-1].gf=gf_conv(symname))==-1){
+ if((i
nt)(i
m.gdes[im.gdes_c-1].gf=gf_conv(symname))==-1){
im_free(&im);
rrd_set_error("unknown function '%s'",symname);
return -1;
im_free(&im);
rrd_set_error("unknown function '%s'",symname);
return -1;
@@
-199,7
+199,7
@@
rrd_xport(int argc, char **argv, int *xsize,
im.gdes[im.gdes_c-1].vname);
return -1;
}
im.gdes[im.gdes_c-1].vname);
return -1;
}
- if((im.gdes[im.gdes_c-1].cf=cf_conv(symname))==-1){
+ if((i
nt)(i
m.gdes[im.gdes_c-1].cf=cf_conv(symname))==-1){
im_free(&im);
rrd_set_error("unknown cf '%s'",symname);
return -1;
im_free(&im);
rrd_set_error("unknown cf '%s'",symname);
return -1;
@@
-376,8
+376,10
@@
rrd_xport_fn(image_desc_t *im,
if ((legend_list[j] = malloc(sizeof(char) * (FMT_LEG_LEN+5)))==NULL) {
free(srcptr_list);
free(ref_list);
if ((legend_list[j] = malloc(sizeof(char) * (FMT_LEG_LEN+5)))==NULL) {
free(srcptr_list);
free(ref_list);
+ free(*data); *data = NULL;
+ while (--j > -1) free(legend_list[j]);
free(legend_list);
free(legend_list);
- rrd_set_error("malloc xp
rin
t legend entry");
+ rrd_set_error("malloc xp
or
t legend entry");
return(-1);
}
return(-1);
}
@@
-394,8
+396,8
@@
rrd_xport_fn(image_desc_t *im,
}
/* fill data structure */
}
/* fill data structure */
- for(dst_row = 0;
dst_row <
row_cnt; dst_row++) {
- for(i = 0; i < nof_xports; i++) {
+ for(dst_row = 0;
(int)dst_row < (int)
row_cnt; dst_row++) {
+ for(i = 0; i <
(int)
nof_xports; i++) {
j = ref_list[i];
ii = im->gdes[j].vidx;
ds_cnt = &im->gdes[ii].ds_cnt;
j = ref_list[i];
ii = im->gdes[j].vidx;
ds_cnt = &im->gdes[ii].ds_cnt;