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_externalivr.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_externalivr.c')
-rw-r--r-- | apps/app_externalivr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index 20eda9b43..936a111ac 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -122,8 +122,8 @@ static void send_eivr_event(FILE *handle, const char event, const char *data, ast_str_append(&tmp, 0, ",%s", data); } - fprintf(handle, "%s\n", tmp->str); - ast_debug(1, "sent '%s'\n", tmp->str); + fprintf(handle, "%s\n", ast_str_buffer(tmp)); + ast_debug(1, "sent '%s'\n", ast_str_buffer(tmp)); } static void *gen_alloc(struct ast_channel *chan, void *params) @@ -276,7 +276,7 @@ static void ast_eivr_getvariable(struct ast_channel *chan, char *data, char *out ast_str_append(&newstring, 0, "%s=%s,", variable, value); ast_channel_unlock(chan); - ast_copy_string(outbuf, newstring->str, outbuflen); + ast_copy_string(outbuf, ast_str_buffer(newstring), outbuflen); } } @@ -659,7 +659,8 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, continue; if (input[0] == 'P') { - send_eivr_event(eivr_events, 'P', args->str, chan); + struct ast_str *tmp = (struct ast_str *) args; + send_eivr_event(eivr_events, 'P', ast_str_buffer(tmp), chan); } else if ( input[0] == 'T' ) { ast_chan_log(LOG_WARNING, chan, "Answering channel if needed and starting generator\n"); if (chan->_state != AST_STATE_UP) { |