From 8e9cd2ee90fee863824b853b2e5bfe20d691ac19 Mon Sep 17 00:00:00 2001 From: oetiker Date: Mon, 6 Apr 2009 14:12:21 +0000 Subject: [PATCH] printf for time_t with %lli can easily cause a segfault since on many platforms time_t is only 32bit ... by adding (long long) to the time value this gets fixed. git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1769 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/src/rrd_update.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/program/src/rrd_update.c b/program/src/rrd_update.c index fa50929a..02e0b1a0 100644 --- a/program/src/rrd_update.c +++ b/program/src/rrd_update.c @@ -1,4 +1,3 @@ - /***************************************************************************** * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 * Copyright by Florian Forster, 2008 @@ -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 - ("[%lli]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]. -- 2.30.2