diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-03-30 02:44:57 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-03-30 02:44:57 +0000 |
| commit | 5f8faf16af107855e6afa2574b3e9436ed20250c (patch) | |
| tree | c0f4d512da952404de20faf78a53a68d2843b021 /res/res_calendar.c | |
| parent | 09b681e344b5f40544ae0de8685a4010cba1d21e (diff) | |
clang compiler warnings: Fix -Wabsolute-value warnings
This patch fixes several warnings caught by clang - in this case, usage of the
abs function on non-integer values. This patch uses labs and fabs, as
appropriate, in the various affected files.
Review: https://reviewboard.asterisk.org/r/4525
ASTERISK-24917
Reported by: dkdegroot
patches:
rb4525.patch submitted by dkdegroot (License 6600)
........
Merged revisions 433749 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_calendar.c')
| -rw-r--r-- | res/res_calendar.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/res/res_calendar.c b/res/res_calendar.c index 980e14125..5b911ca5b 100644 --- a/res/res_calendar.c +++ b/res/res_calendar.c @@ -1106,8 +1106,8 @@ static struct ast_custom_function calendar_busy_function = { static int add_event_to_list(struct eventlist *events, struct ast_calendar_event *event, time_t start, time_t end) { struct evententry *entry, *iter; - int event_startdiff = abs(start - event->start); - int event_enddiff = abs(end - event->end); + long event_startdiff = labs(start - event->start); + long event_enddiff = labs(end - event->end); int i = 0; if (!(entry = ast_calloc(1, sizeof(*entry)))) { @@ -1120,16 +1120,16 @@ static int add_event_to_list(struct eventlist *events, struct ast_calendar_event if (start == end) { AST_LIST_TRAVERSE_SAFE_BEGIN(events, iter, list) { - int startdiff = abs(iter->event->start - start); + long startdiff = labs(iter->event->start - start); - ast_debug(10, "Comparing %s with startdiff %d to %s with startdiff %d\n", event->summary, event_startdiff, iter->event->summary, startdiff); + ast_debug(10, "Comparing %s with startdiff %ld to %s with startdiff %ld\n", event->summary, event_startdiff, iter->event->summary, startdiff); ++i; if (startdiff > event_startdiff) { AST_LIST_INSERT_BEFORE_CURRENT(entry, list); return i; } if (startdiff == event_startdiff) { - int enddiff = abs(iter->event->end - end); + long enddiff = labs(iter->event->end - end); if (enddiff > event_enddiff) { AST_LIST_INSERT_BEFORE_CURRENT(entry, list); |