From 907050d41b11c6b8873e45b93148fd0dd1e94569 Mon Sep 17 00:00:00 2001 From: Walter Doekes Date: Mon, 19 Nov 2012 20:03:56 +0000 Subject: Fix most leftover non-opaque ast_str uses. Instead of calling str->str, one should use ast_str_buffer(str). Same goes for str->used as ast_str_strlen(str) and str->len as ast_str_size(str). Review: https://reviewboard.asterisk.org/r/2198 ........ Merged revisions 376469 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 376470 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 376471 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@376472 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/indications.c | 2 +- main/security_events.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'main') diff --git a/main/indications.c b/main/indications.c index f3356d603..8854ad909 100644 --- a/main/indications.c +++ b/main/indications.c @@ -873,7 +873,7 @@ static char *handle_cli_indication_show(struct ast_cli_entry *e, int cmd, struct (j == tz->nrringcadence - 1) ? "" : ","); } ast_str_append(&buf, 0, "\n"); - ast_cli(a->fd, "%s", buf->str); + ast_cli(a->fd, "%s", ast_str_buffer(buf)); AST_LIST_TRAVERSE(&tz->tones, ts, entry) { ast_cli(a->fd, "%-7.7s %-15.15s %s\n", tz->country, ts->name, ts->data); diff --git a/main/security_events.c b/main/security_events.c index 51a8e0582..bdb9b21c8 100644 --- a/main/security_events.c +++ b/main/security_events.c @@ -491,7 +491,7 @@ static struct ast_event *alloc_event(const struct ast_security_event_common *sec return ast_event_new(AST_EVENT_SECURITY, AST_EVENT_IE_SECURITY_EVENT, AST_EVENT_IE_PLTYPE_UINT, sec->event_type, AST_EVENT_IE_EVENT_VERSION, AST_EVENT_IE_PLTYPE_UINT, sec->version, - AST_EVENT_IE_EVENT_TV, AST_EVENT_IE_PLTYPE_STR, str->str, + AST_EVENT_IE_EVENT_TV, AST_EVENT_IE_PLTYPE_STR, ast_str_buffer(str), AST_EVENT_IE_SERVICE, AST_EVENT_IE_PLTYPE_STR, sec->service, AST_EVENT_IE_SEVERITY, AST_EVENT_IE_PLTYPE_STR, severity_str, AST_EVENT_IE_END); -- cgit v1.2.3