diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 3 | ||||
| -rw-r--r-- | main/manager.c | 2 | ||||
| -rw-r--r-- | main/sched.c | 2 | ||||
| -rw-r--r-- | main/taskprocessor.c | 2 | ||||
| -rw-r--r-- | main/utils.c | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/main/features.c b/main/features.c index 0b8797fcc..333b5a0f2 100644 --- a/main/features.c +++ b/main/features.c @@ -3565,7 +3565,8 @@ static char *handle_parkedcalls(struct ast_cli_entry *e, int cmd, struct ast_cli AST_LIST_TRAVERSE(&curlot->parkings, cur, list) { ast_cli(a->fd, "%-10.10s %25s (%-15s %-12s %-4d) %6lds\n" ,cur->parkingexten, cur->chan->name, cur->context, cur->exten - ,cur->priority, cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL)); + ,cur->priority, + (long)(cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL)) ); numparked++; numparked += lotparked; } diff --git a/main/manager.c b/main/manager.c index 2df5e8164..9ad8bd8ca 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3105,7 +3105,7 @@ int __manager_event(int category, const char *event, now = ast_tvnow(); ast_str_append(&buf, 0, "Timestamp: %ld.%06lu\r\n", - now.tv_sec, (unsigned long) now.tv_usec); + (long)now.tv_sec, (unsigned long) now.tv_usec); } if (manager_debug) { static int seq; diff --git a/main/sched.c b/main/sched.c index 91d86164e..c40375d72 100644 --- a/main/sched.c +++ b/main/sched.c @@ -437,7 +437,7 @@ void ast_sched_dump(const struct sched_context *con) q->id, q->callback, q->data, - delta.tv_sec, + (long)delta.tv_sec, (long int)delta.tv_usec); } ast_debug(1, "=============================================================\n"); diff --git a/main/taskprocessor.c b/main/taskprocessor.c index cf88bb2e7..171a07725 100644 --- a/main/taskprocessor.c +++ b/main/taskprocessor.c @@ -220,7 +220,7 @@ static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args ast_mutex_unlock(&cli_ping_cond_lock); end = ast_tvnow(); delta = ast_tvsub(end, begin); - ast_cli(a->fd, "\n\t%24s ping time: %.1ld.%.6ld sec\n\n", name, delta.tv_sec, (long int)delta.tv_usec); + ast_cli(a->fd, "\n\t%24s ping time: %.1ld.%.6ld sec\n\n", name, (long)delta.tv_sec, (long int)delta.tv_usec); ao2_ref(tps, -1); return CLI_SUCCESS; } diff --git a/main/utils.c b/main/utils.c index a34514b98..92da333c3 100644 --- a/main/utils.c +++ b/main/utils.c @@ -1202,12 +1202,12 @@ static struct timeval tvfix(struct timeval a) { if (a.tv_usec >= ONE_MILLION) { ast_log(LOG_WARNING, "warning too large timestamp %ld.%ld\n", - a.tv_sec, (long int) a.tv_usec); + (long)a.tv_sec, (long int) a.tv_usec); a.tv_sec += a.tv_usec / ONE_MILLION; a.tv_usec %= ONE_MILLION; } else if (a.tv_usec < 0) { ast_log(LOG_WARNING, "warning negative timestamp %ld.%ld\n", - a.tv_sec, (long int) a.tv_usec); + (long)a.tv_sec, (long int) a.tv_usec); a.tv_usec = 0; } return a; |