diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-12-13 08:36:35 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-12-13 08:36:35 +0000 |
| commit | c8223fc9578754dfaef1b337e5f0dfff546461b4 (patch) | |
| tree | 0559c99680217b78c0bda37a131b5f09794f43c6 /apps/app_chanisavail.c | |
| parent | 3b96ae826e7e280bff1d16ddc50d9328c7ea70ac (diff) | |
Merge ast_str_opaque branch (discontinue usage of ast_str internals)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@163991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_chanisavail.c')
| -rw-r--r-- | apps/app_chanisavail.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c index bc1adcc79..556bafd71 100644 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -160,13 +160,13 @@ static int chanavail_exec(struct ast_channel *chan, void *data) status = inuse = ast_device_state(trychan); } if ((inuse <= 1) && (tempchan = ast_request(tech, chan->nativeformats, number, &status))) { - ast_str_append(&tmp_availchan, 0, "%s%s", tmp_availchan->used ? "&" : "", tempchan->name); + ast_str_append(&tmp_availchan, 0, "%s%s", ast_str_strlen(tmp_availchan) ? "&" : "", tempchan->name); snprintf(tmp, sizeof(tmp), "%s/%s", tech, number); - ast_str_append(&tmp_availorig, 0, "%s%s", tmp_availorig->used ? "&" : "", tmp); + ast_str_append(&tmp_availorig, 0, "%s%s", ast_str_strlen(tmp_availorig) ? "&" : "", tmp); snprintf(tmp, sizeof(tmp), "%d", status); - ast_str_append(&tmp_availstat, 0, "%s%s", tmp_availstat->used ? "&" : "", tmp); + ast_str_append(&tmp_availstat, 0, "%s%s", ast_str_strlen(tmp_availstat) ? "&" : "", tmp); ast_hangup(tempchan); tempchan = NULL; @@ -176,16 +176,16 @@ static int chanavail_exec(struct ast_channel *chan, void *data) } } else { snprintf(tmp, sizeof(tmp), "%d", status); - ast_str_append(&tmp_availstat, 0, "%s%s", tmp_availstat->used ? "&" : "", tmp); + ast_str_append(&tmp_availstat, 0, "%s%s", ast_str_strlen(tmp_availstat) ? "&" : "", tmp); } cur = rest; } while (cur); } - pbx_builtin_setvar_helper(chan, "AVAILCHAN", tmp_availchan->str); + pbx_builtin_setvar_helper(chan, "AVAILCHAN", ast_str_buffer(tmp_availchan)); /* Store the originally used channel too */ - pbx_builtin_setvar_helper(chan, "AVAILORIGCHAN", tmp_availorig->str); - pbx_builtin_setvar_helper(chan, "AVAILSTATUS", tmp_availstat->str); + pbx_builtin_setvar_helper(chan, "AVAILORIGCHAN", ast_str_buffer(tmp_availorig)); + pbx_builtin_setvar_helper(chan, "AVAILSTATUS", ast_str_buffer(tmp_availstat)); return 0; } |