diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-26 18:19:12 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-26 18:19:12 +0000 |
commit | c5acba479d47d47b0809d2627f22762e77a7669f (patch) | |
tree | 1a9f3f52b9d9fdc502c341ca74ba1231bc98d753 /apps | |
parent | 678447e2d0fca85d2879bb94a68fda191f26f2dc (diff) |
cast time_t to an int in printf/scanf (issue #5635)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@7634 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_chanspy.c | 2 | ||||
-rw-r--r-- | apps/app_externalivr.c | 4 | ||||
-rw-r--r-- | apps/app_queue.c | 16 | ||||
-rw-r--r-- | apps/app_sms.c | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 58a6787d0..25a195096 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -439,7 +439,7 @@ static int chanspy_exec(struct ast_channel *chan, void *data) if (recbase) { char filename[512]; - snprintf(filename,sizeof(filename),"%s/%s.%ld.raw",ast_config_AST_MONITOR_DIR, recbase, time(NULL)); + snprintf(filename,sizeof(filename),"%s/%s.%d.raw",ast_config_AST_MONITOR_DIR, recbase, (int)time(NULL)); if ((fd = open(filename, O_CREAT | O_WRONLY, O_TRUNC)) <= 0) { ast_log(LOG_WARNING, "Cannot open %s for recording\n", filename); fd = 0; diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index ad27c1659..a53a59532 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -94,9 +94,9 @@ static void send_child_event(FILE *handle, const char event, const char *data, char tmp[256]; if (!data) { - snprintf(tmp, sizeof(tmp), "%c,%10ld", event, time(NULL)); + snprintf(tmp, sizeof(tmp), "%c,%10d", event, (int)time(NULL)); } else { - snprintf(tmp, sizeof(tmp), "%c,%10ld,%s", event, time(NULL), data); + snprintf(tmp, sizeof(tmp), "%c,%10d,%s", event, (int)time(NULL), data); } fprintf(handle, "%s\n", tmp); diff --git a/apps/app_queue.c b/apps/app_queue.c index a6c7e3446..f34e6a0b2 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -484,11 +484,11 @@ static void *changethread(void *data) "Membership: %s\r\n" "Penalty: %d\r\n" "CallsTaken: %d\r\n" - "LastCall: %ld\r\n" + "LastCall: %d\r\n" "Status: %d\r\n" "Paused: %d\r\n", q->name, cur->interface, cur->dynamic ? "dynamic" : "static", - cur->penalty, cur->calls, cur->lastcall, cur->status, cur->paused); + cur->penalty, cur->calls, (int)cur->lastcall, cur->status, cur->paused); } } } @@ -1262,11 +1262,11 @@ static int update_status(struct ast_call_queue *q, struct member *member, int st "Membership: %s\r\n" "Penalty: %d\r\n" "CallsTaken: %d\r\n" - "LastCall: %ld\r\n" + "LastCall: %d\r\n" "Status: %d\r\n" "Paused: %d\r\n", q->name, cur->interface, cur->dynamic ? "dynamic" : "static", - cur->penalty, cur->calls, cur->lastcall, cur->status, cur->paused); + cur->penalty, cur->calls, (int)cur->lastcall, cur->status, cur->paused); } break; } @@ -2422,11 +2422,11 @@ static int add_to_queue(char *queuename, char *interface, int penalty, int pause "Membership: %s\r\n" "Penalty: %d\r\n" "CallsTaken: %d\r\n" - "LastCall: %ld\r\n" + "LastCall: %d\r\n" "Status: %d\r\n" "Paused: %d\r\n", q->name, new_member->interface, new_member->dynamic ? "dynamic" : "static", - new_member->penalty, new_member->calls, new_member->lastcall, new_member->status, new_member->paused); + new_member->penalty, new_member->calls, (int)new_member->lastcall, new_member->status, new_member->paused); if (dump) dump_queue_members(q); @@ -3436,13 +3436,13 @@ static int manager_queues_status( struct mansession *s, struct message *m ) "Membership: %s\r\n" "Penalty: %d\r\n" "CallsTaken: %d\r\n" - "LastCall: %ld\r\n" + "LastCall: %d\r\n" "Status: %d\r\n" "Paused: %d\r\n" "%s" "\r\n", q->name, mem->interface, mem->dynamic ? "dynamic" : "static", - mem->penalty, mem->calls, mem->lastcall, mem->status, mem->paused, idText); + mem->penalty, mem->calls, (int)mem->lastcall, mem->status, mem->paused, idText); } } /* List Queue Entries */ diff --git a/apps/app_sms.c b/apps/app_sms.c index c6feb5560..4c15cc185 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -694,7 +694,7 @@ static void sms_readfile (sms_t * h, char *fn) } while (fgets (line, sizeof (line), s)) { /* process line in file */ - char *p; + unsigned char *p; for (p = line; *p && *p != '\n' && *p != '\r'; p++); *p = 0; /* strip eoln */ p = line; @@ -1379,8 +1379,8 @@ static int sms_exec (struct ast_channel *chan, void *data) ast_copy_string (h.cli, chan->cid.cid_num, sizeof (h.cli)); { - char *d = data, - *p, + unsigned char *p; + unsigned char *d = data, answer = 0; if (!*d || *d == '|') { ast_log (LOG_ERROR, "Requires queue name\n"); @@ -1449,7 +1449,7 @@ static int sms_exec (struct ast_channel *chan, void *data) d = p; h.udl = 0; while (*p && h.udl < SMSLEN) - h.ud[h.udl++] = utf8decode((unsigned char **)&p); + h.ud[h.udl++] = utf8decode(&p); if (is7bit (h.dcs) && packsms7 (0, h.udhl, h.udh, h.udl, h.ud) < 0) ast_log (LOG_WARNING, "Invalid 7 bit GSM data\n"); if (is8bit (h.dcs) && packsms8 (0, h.udhl, h.udh, h.udl, h.ud) < 0) |