diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
| commit | abd3e4040bd76058d0148884879858894258fb9f (patch) | |
| tree | c5695a0880c4928731b1aa864f862c6cffa57428 /res/res_calendar.c | |
| parent | f3b55da1b855b12a59f84fd9bf6768eb101cd910 (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.c')
| -rw-r--r-- | res/res_calendar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_calendar.c b/res/res_calendar.c index e6c93fdc7..ae52cbfce 100644 --- a/res/res_calendar.c +++ b/res/res_calendar.c @@ -697,7 +697,7 @@ static void *event_notification_duplicate(void *data) /*! \brief Generate 32 byte random string (stolen from chan_sip.c)*/ static char *generate_random_string(char *buf, size_t size) { - long val[4]; + unsigned long val[4]; int x; for (x = 0; x < 4; x++) { @@ -1368,7 +1368,7 @@ static int calendar_query_result_exec(struct ast_channel *chan, const char *cmd, } else if (!strcasecmp(args.field, "end")) { snprintf(buf, len, "%ld", (long) entry->event->end); } else if (!strcasecmp(args.field, "busystate")) { - snprintf(buf, len, "%d", entry->event->busy_state); + snprintf(buf, len, "%u", entry->event->busy_state); } else if (!strcasecmp(args.field, "attendees")) { calendar_join_attendees(entry->event, buf, len); } else { @@ -1429,7 +1429,7 @@ static int calendar_write_exec(struct ast_channel *chan, const char *cmd, char * } if (fields.argc - 1 != values.argc) { - ast_log(LOG_WARNING, "CALENDAR_WRITE should have the same number of fields (%d) and values (%d)!\n", fields.argc - 1, values.argc); + ast_log(LOG_WARNING, "CALENDAR_WRITE should have the same number of fields (%u) and values (%u)!\n", fields.argc - 1, values.argc); goto write_cleanup; } @@ -1729,7 +1729,7 @@ static int calendar_event_read(struct ast_channel *chan, const char *cmd, char * } else if (!strcasecmp(data, "end")) { snprintf(buf, len, "%ld", (long)event->end); } else if (!strcasecmp(data, "busystate")) { - snprintf(buf, len, "%d", event->busy_state); + snprintf(buf, len, "%u", event->busy_state); } else if (!strcasecmp(data, "attendees")) { calendar_join_attendees(event, buf, len); } |