diff options
author | Mark Spencer <markster@digium.com> | 2006-02-23 04:38:38 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2006-02-23 04:38:38 +0000 |
commit | c3447c7cce376c33d3ef7bf07ab5e4776f221534 (patch) | |
tree | 3d2469d4b90405e234aaf1c5354e1ec6130e48fc /pbx/pbx_dundi.c | |
parent | 850397b334fc71f9dfc141a178146eceda654acd (diff) |
Fix a few compile warnings (turned errors) and disable -Werror on the
normal build. If people want this they can turn it on, and don't anyone
turn it on by default until you fix building on GCC 4.x
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/pbx_dundi.c')
-rw-r--r-- | pbx/pbx_dundi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 1bafab2d6..9d842c69b 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -1132,10 +1132,12 @@ 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 *)&timeout, &length) == 1) { + if (sscanf(ptr, "%d|%n", (int *)&x, &length) == 1) { + timeout = x; expiration = timeout - now; if (expiration > 0) { ast_log(LOG_DEBUG, "Found cache expiring in %d seconds!\n", (int)(timeout - now)); @@ -2028,9 +2030,11 @@ 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 *)&expired) == 1) { + if (sscanf(tmp, "%d", (int *)&x) == 1) { + expired = x; ast_db_get(secretpath, "secret", tmp, sizeof(tmp)); current = strchr(tmp, ';'); if (!current) |