summaryrefslogtreecommitdiff
path: root/res/res_calendar_caldav.c
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2014-05-09 22:49:26 +0000
committerKinsey Moore <kmoore@digium.com>2014-05-09 22:49:26 +0000
commitabd3e4040bd76058d0148884879858894258fb9f (patch)
treec5695a0880c4928731b1aa864f862c6cffa57428 /res/res_calendar_caldav.c
parentf3b55da1b855b12a59f84fd9bf6768eb101cd910 (diff)
Allow Asterisk to compile under GCC 4.10
This resolves a large number of compiler warnings from GCC 4.10 which cause the build to fail under dev mode. The vast majority are signed/unsigned mismatches in printf-style format strings. ........ Merged revisions 413586 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 413587 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 413588 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_calendar_caldav.c')
-rw-r--r--res/res_calendar_caldav.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c
index 0bf3e63cc..d9dde31c2 100644
--- a/res/res_calendar_caldav.c
+++ b/res/res_calendar_caldav.c
@@ -202,7 +202,10 @@ static int caldav_write_event(struct ast_calendar_event *event)
for (x = 0; x < 8; x++) {
val[x] = ast_random();
}
- ast_string_field_build(event, uid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x", val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7]);
+ ast_string_field_build(event, uid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+ (unsigned)val[0], (unsigned)val[1], (unsigned)val[2],
+ (unsigned)val[3], (unsigned)val[4], (unsigned)val[5],
+ (unsigned)val[6], (unsigned)val[7]);
}
calendar = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
@@ -401,7 +404,7 @@ static void caldav_add_event(icalcomponent *comp, struct icaltime_span *span, vo
ast_string_field_set(event, uid, event->summary);
} else {
char tmp[100];
- snprintf(tmp, sizeof(tmp), "%lu", event->start);
+ snprintf(tmp, sizeof(tmp), "%ld", event->start);
ast_string_field_set(event, uid, tmp);
}
}