kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

add 'consumed' argument to ast_get_time_t, so callers can know how many characters were used in the parser

Browse Source 
update pbx_dundi to use ast_get_time_t
eliminate some compiler warnings


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-02-23 17:13:57 +00:00
parent c3447c7cce
commit 302c943001
11 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pbx/pbx_dundi.c
View File

@@ -1132,16 +1132,15 @@ static int cache_lookup_internal(time_t now, struct dundi_request *req, char *ke
int expiration;
char fs[256];
time_t timeout;
unsigned int x;
/* Build request string */
if (!ast_db_get("dundi/cache", key, data, sizeof(data))) {
ptr = data;
if (sscanf(ptr, "%d|%n", (int *)&x, &length) == 1) {
timeout = x;
if (!ast_get_time_t(ptr, &timeout, 0, &length)) {
expiration = timeout - now;
if (expiration > 0) {
ast_log(LOG_DEBUG, "Found cache expiring in %d seconds!\n", (int)(timeout - now));
ptr += length;
ptr += length + 1;
while((sscanf(ptr, "%d/%d/%d/%n", &(flags.flags), &weight, &tech, &length) == 3)) {
ptr += length;
term = strchr(ptr, '|');
@@ -2030,11 +2029,9 @@ static void load_password(void)
char *last=NULL;
char tmp[256];
time_t expired;
unsigned int x;
ast_db_get(secretpath, "secretexpiry", tmp, sizeof(tmp));
if (sscanf(tmp, "%d", (int *)&x) == 1) {
expired = x;
if (!ast_get_time_t(tmp, &expired, 0, NULL)) {
ast_db_get(secretpath, "secret", tmp, sizeof(tmp));
current = strchr(tmp, ';');
if (!current)