X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_update.c;h=02e0b1a045a92266602dc28e516615082f19d764;hb=fa908e68adb7ba747ef86c2cc62edc103b07aa2d;hp=1d9d5150d325f90a65af55ade48702c7ddce02b5;hpb=04ddf3a097198c83d74a60bc2f260b33db5ba92e;p=rrdtool.git diff --git a/src/rrd_update.c b/src/rrd_update.c index 1d9d515..02e0b1a 100644 --- a/src/rrd_update.c +++ b/src/rrd_update.c @@ -1,4 +1,3 @@ - /***************************************************************************** * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 * Copyright by Florian Forster, 2008 @@ -449,7 +448,7 @@ int rrd_update( { rc = rrdc_update (argv[optind], /* file */ argc - optind - 1, /* values_num */ - (void *) (argv + optind + 1)); /* values */ + (const char *const *) (argv + optind + 1)); /* values */ if (rc > 0) rrd_set_error("Failed sending the values to rrdcached: %s", rrd_strerror (rc)); @@ -1904,7 +1903,7 @@ static int write_to_rras( + ds_cnt * rra_ptr->cur_row * sizeof(rrd_value_t); /* re-seek if the position is wrong or we wrapped around */ - if (rra_pos_new != rrd_file->pos) { + if ((size_t)rra_pos_new != rrd_file->pos) { if (rrd_seek(rrd_file, rra_pos_new, SEEK_SET) != 0) { rrd_set_error("seek error in rrd"); return -1; @@ -1967,11 +1966,12 @@ static int write_RRA_row( /* append info to the return hash */ *pcdp_summary = rrd_info_push(*pcdp_summary, sprintf_alloc - ("[%d]RRA[%s][%lu]DS[%s]", rra_time, + ("[%lli]RRA[%s][%lu]DS[%s]", + (long long)rra_time, rrd->rra_def[rra_idx].cf_nam, rrd->rra_def[rra_idx].pdp_cnt, rrd->ds_def[ds_idx].ds_nam), - RD_I_VAL, iv); + RD_I_VAL, iv); } if (rrd_write(rrd_file, &(rrd->cdp_prep[cdp_idx].scratch[CDP_scratch_idx].