diff options
Diffstat (limited to 'comms/asterisk18/patches/patch-ay')
| -rw-r--r-- | comms/asterisk18/patches/patch-ay | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/comms/asterisk18/patches/patch-ay b/comms/asterisk18/patches/patch-ay new file mode 100644 index 00000000000..737588f428c --- /dev/null +++ b/comms/asterisk18/patches/patch-ay @@ -0,0 +1,84 @@ +$NetBSD: patch-ay,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $ + +--- main/features.c.orig 2010-09-29 21:12:43.000000000 +0000 ++++ main/features.c +@@ -1005,12 +1005,12 @@ static int park_call_full(struct ast_cha + "Channel: %s\r\n" + "Parkinglot: %s\r\n" + "From: %s\r\n" +- "Timeout: %ld\r\n" ++ "Timeout: %jd\r\n" + "CallerIDNum: %s\r\n" + "CallerIDName: %s\r\n" + "Uniqueid: %s\r\n", + pu->parkingexten, pu->chan->name, pu->parkinglot->name, event_from ? event_from : "", +- (long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL), ++ (intmax_t)pu->start.tv_sec + (intmax_t)(pu->parkingtime/1000) - (intmax_t)time(NULL), + S_COR(pu->chan->caller.id.number.valid, pu->chan->caller.id.number.str, "<unknown>"), + S_COR(pu->chan->caller.id.name.valid, pu->chan->caller.id.name.str, "<unknown>"), + pu->chan->uniqueid +@@ -1473,7 +1473,7 @@ static int builtin_automonitor(struct as + len = strlen(touch_monitor) + 50; + args = alloca(len); + touch_filename = alloca(len); +- snprintf(touch_filename, len, "%s-%ld-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), touch_monitor); ++ snprintf(touch_filename, len, "%s-%jd-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), touch_monitor); + snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); + } else { + caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid, +@@ -1483,7 +1483,7 @@ static int builtin_automonitor(struct as + len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50; + args = alloca(len); + touch_filename = alloca(len); +- snprintf(touch_filename, len, "%s-%ld-%s-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), caller_chan_id, callee_chan_id); ++ snprintf(touch_filename, len, "%s-%jd-%s-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), caller_chan_id, callee_chan_id); + snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename); + } + +@@ -1589,7 +1589,7 @@ static int builtin_automixmonitor(struct + len = strlen(touch_monitor) + 50; + args = alloca(len); + touch_filename = alloca(len); +- snprintf(touch_filename, len, "auto-%ld-%s", (long)time(NULL), touch_monitor); ++ snprintf(touch_filename, len, "auto-%jd-%s", (intmax_t)time(NULL), touch_monitor); + snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav"); + } else { + caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid, +@@ -1599,7 +1599,7 @@ static int builtin_automixmonitor(struct + len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50; + args = alloca(len); + touch_filename = alloca(len); +- snprintf(touch_filename, len, "auto-%ld-%s-%s", (long)time(NULL), caller_chan_id, callee_chan_id); ++ snprintf(touch_filename, len, "auto-%jd-%s-%s", (intmax_t)time(NULL), caller_chan_id, callee_chan_id); + snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav")); + } + +@@ -5089,10 +5089,10 @@ static char *handle_parkedcalls(struct a + + AST_LIST_LOCK(&curlot->parkings); + AST_LIST_TRAVERSE(&curlot->parkings, cur, list) { +- ast_cli(a->fd, "%-10.10s %25s (%-15s %-12s %-4d) %6lds\n" ++ ast_cli(a->fd, "%-10.10s %25s (%-15s %-12s %-4d) %6jds\n" + ,cur->parkingexten, cur->chan->name, cur->context, cur->exten + ,cur->priority, +- (long)(cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL)) ); ++ (intmax_t)(cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL)) ); + numparked++; + numparked += lotparked; + } +@@ -5144,13 +5144,13 @@ static int manager_parking_status(struct + "Exten: %d\r\n" + "Channel: %s\r\n" + "From: %s\r\n" +- "Timeout: %ld\r\n" ++ "Timeout: %jd\r\n" + "CallerIDNum: %s\r\n" + "CallerIDName: %s\r\n" + "%s" + "\r\n", + cur->parkingnum, cur->chan->name, cur->peername, +- (long) cur->start.tv_sec + (long) (cur->parkingtime / 1000) - (long) time(NULL), ++ (intmax_t) cur->start.tv_sec + (intmax_t) (cur->parkingtime / 1000) - (intmax_t) time(NULL), + S_COR(cur->chan->caller.id.number.valid, cur->chan->caller.id.number.str, ""), /* XXX in other places it is <unknown> */ + S_COR(cur->chan->caller.id.name.valid, cur->chan->caller.id.name.str, ""), + idText); |