kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cast time_t type variables to long where needed.

Browse Source 
This makes res_calendar.c compile on OpenBSD and the same
cast is used in a lot of other places where time_t type vars are used.

(closes issue #15656)
Reported by: mvanbaak
Patches:
      2009081100-rescalendarcompilefix.diff.txt uploaded by mvanbaak (license 7)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@212343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Michiel van Baak
2009-08-15 11:36:19 +00:00
parent 44ae313422
commit 6f63f3eb8d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_calendar.c
View File

@@ -637,8 +637,8 @@ static int calendar_event_notify(const void *data)
}
snprintf(busystate, sizeof(busystate), "%d", event->busy_state);
snprintf(start, sizeof(start), "%lu", event->start);
snprintf(end, sizeof(end), "%lu", event->end);
snprintf(start, sizeof(start), "%lu", (long) event->start);
snprintf(end, sizeof(end), "%lu", (long) event->end);
chan->nativeformats = AST_FORMAT_SLINEAR;
@@ -762,7 +762,7 @@ static int schedule_calendar_event(struct ast_calendar *cal, struct ast_calendar
ast_mutex_lock(&refreshlock);
AST_SCHED_REPLACE(old_event->notify_sched, sched, alarm_notify_sched, calendar_event_notify, old_event);
ast_mutex_unlock(&refreshlock);
ast_debug(3, "Calendar alarm event notification scheduled to happen in %ld ms\n", alarm_notify_sched);
ast_debug(3, "Calendar alarm event notification scheduled to happen in %ld ms\n", (long) alarm_notify_sched);
}
}
@@ -777,7 +777,7 @@ static int schedule_calendar_event(struct ast_calendar *cal, struct ast_calendar
ast_mutex_lock(&refreshlock);
AST_SCHED_REPLACE(old_event->bs_start_sched, sched, devstate_sched_start, calendar_devstate_change, old_event);
ast_mutex_unlock(&refreshlock);
ast_debug(3, "Calendar bs_start event notification scheduled to happen in %ld ms\n", devstate_sched_start);
ast_debug(3, "Calendar bs_start event notification scheduled to happen in %ld ms\n", (long) devstate_sched_start);
}
if (!cmp_event || old_event->end != event->end) {
@@ -786,7 +786,7 @@ static int schedule_calendar_event(struct ast_calendar *cal, struct ast_calendar
ast_mutex_lock(&refreshlock);
AST_SCHED_REPLACE(old_event->bs_end_sched, sched, devstate_sched_end, calendar_devstate_change, old_event);
ast_mutex_unlock(&refreshlock);
ast_debug(3, "Calendar bs_end event notification scheduled to happen in %ld ms\n", devstate_sched_end);
ast_debug(3, "Calendar bs_end event notification scheduled to happen in %ld ms\n", (long) devstate_sched_end);
}
if (changed) {
@@ -1040,7 +1040,7 @@ static int calendar_query_exec(struct ast_channel *chan, const char *cmd, char *
i = ao2_iterator_init(cal->events, 0);
while ((event = ao2_iterator_next(&i))) {
if (!(start > event->end || end < event->start)) {
ast_debug(10, "%s (%ld - %ld) overlapped with (%ld - %ld)\n", event->summary, event->start, event->end, start, end);
ast_debug(10, "%s (%ld - %ld) overlapped with (%ld - %ld)\n", event->summary, (long) event->start, (long) event->end, (long) start, (long) end);
if (add_event_to_list(events, event, start, end) < 0) {
event = ast_calendar_unref_event(event);
return -1;
@@ -1152,9 +1152,9 @@ static int calendar_query_result_exec(struct ast_channel *chan, const char *cmd,
} else if (!strcasecmp(args.field, "uid")) {
ast_copy_string(buf, entry->event->uid, len);
} else if (!strcasecmp(args.field, "start")) {
snprintf(buf, len, "%ld", entry->event->start);
snprintf(buf, len, "%ld", (long) entry->event->start);
} else if (!strcasecmp(args.field, "end")) {
snprintf(buf, len, "%ld", entry->event->end);
snprintf(buf, len, "%ld", (long) entry->event->end);
} else if (!strcasecmp(args.field, "busystate")) {
snprintf(buf, len, "%d", entry->event->busy_state);
} else if (!strcasecmp(args.field, "attendees")) {