From a41b34a63c52608e7e5c8e6aced613815461f4c2 Mon Sep 17 00:00:00 2001 From: tilghman Date: Sat, 13 Dec 2008 08:36:35 +0000 Subject: Merge ast_str_opaque branch (discontinue usage of ast_str internals) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@163991 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_externalivr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'apps/app_externalivr.c') 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) { -- cgit v1.2.3