diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-02-22 22:53:49 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-02-22 22:53:49 +0000 |
| commit | 6204abdae2f51fd8e23702532c3a4e93002396e1 (patch) | |
| tree | c3e6c9f1df9f8d9321bbbd0d8108548d64f706dd /res | |
| parent | fdd33866b438de919356cb5bb30a811ecb0e66f9 (diff) | |
merge rizzo's patch to make compiler warnings stop the build, and fix a bunch of warnings found
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_features.c | 4 | ||||
| -rw-r--r-- | res/res_osp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/res_features.c b/res/res_features.c index 1c4421c00..b70299126 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -483,7 +483,7 @@ static int builtin_automonitor(struct ast_channel *chan, struct ast_channel *pee len = strlen(touch_monitor) + 50; args = alloca(len); touch_filename = alloca(len); - snprintf(touch_filename, len, "auto-%ld-%s", time(NULL), touch_monitor); + snprintf(touch_filename, len, "auto-%ld-%s", (long)time(NULL), touch_monitor); snprintf(args, len, "%s|%s|m", (touch_format) ? touch_format : "wav", touch_filename); } else { caller_chan_id = ast_strdupa(caller_chan->cid.cid_num ? caller_chan->cid.cid_num : caller_chan->name); @@ -491,7 +491,7 @@ static int builtin_automonitor(struct ast_channel *chan, struct ast_channel *pee 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", time(NULL), caller_chan_id, callee_chan_id); + snprintf(touch_filename, len, "auto-%ld-%s-%s", (long)time(NULL), caller_chan_id, callee_chan_id); snprintf(args, len, "%s|%s|m", (touch_format) ? touch_format : "wav", touch_filename); } diff --git a/res/res_osp.c b/res/res_osp.c index 339096a4a..65b6a575a 100644 --- a/res/res_osp.c +++ b/res/res_osp.c @@ -568,7 +568,7 @@ int ast_osp_lookup(struct ast_channel *chan, char *provider, char *extension, ch char destination[2048]=""; char token[2000]; char tmp[256]="", *l, *n; - char *devinfo = NULL; + const char *devinfo = NULL; result->handle = -1; result->numresults = 0; |