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 /res/res_config_curl.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 'res/res_config_curl.c')
| -rw-r--r-- | res/res_config_curl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/res/res_config_curl.c b/res/res_config_curl.c index b159c768d..1d259c845 100644 --- a/res/res_config_curl.c +++ b/res/res_config_curl.c @@ -88,7 +88,7 @@ static struct ast_variable *realtime_curl(const char *url, const char *unused, v va_end(ap); ast_str_append(&query, 0, ")}"); - pbx_substitute_variables_helper(NULL, query->str, buffer, bufsize); + pbx_substitute_variables_helper(NULL, ast_str_buffer(query), buffer, bufsize); /* Remove any trailing newline characters */ if ((stringp = strchr(buffer, '\r')) || (stringp = strchr(buffer, '\n'))) @@ -170,7 +170,7 @@ static struct ast_config *realtime_multi_curl(const char *url, const char *unuse ast_str_append(&query, 0, ")}"); /* Do the CURL query */ - pbx_substitute_variables_helper(NULL, query->str, buffer, bufsize); + pbx_substitute_variables_helper(NULL, ast_str_buffer(query), buffer, bufsize); if (!(cfg = ast_config_new())) goto exit_multi; @@ -258,7 +258,7 @@ static int update_curl(const char *url, const char *unused, const char *keyfield va_end(ap); ast_str_append(&query, 0, ")}"); - pbx_substitute_variables_helper(NULL, query->str, buffer, bufsize); + pbx_substitute_variables_helper(NULL, ast_str_buffer(query), buffer, bufsize); /* Line oriented output */ stringp = buffer; @@ -321,7 +321,7 @@ static int update2_curl(const char *url, const char *unused, va_list ap) ast_str_append(&query, 0, ")}"); /* TODO: Make proxies work */ - pbx_substitute_variables_helper(NULL, query->str, buffer, bufsize); + pbx_substitute_variables_helper(NULL, ast_str_buffer(query), buffer, bufsize); /* Line oriented output */ stringp = buffer; @@ -385,7 +385,7 @@ static int store_curl(const char *url, const char *unused, va_list ap) va_end(ap); ast_str_append(&query, 0, ")}"); - pbx_substitute_variables_helper(NULL, query->str, buffer, bufsize); + pbx_substitute_variables_helper(NULL, ast_str_buffer(query), buffer, bufsize); stringp = buffer; while (*stringp <= ' ') @@ -452,7 +452,7 @@ static int destroy_curl(const char *url, const char *unused, const char *keyfiel va_end(ap); ast_str_append(&query, 0, ")}"); - pbx_substitute_variables_helper(NULL, query->str, buffer, bufsize); + pbx_substitute_variables_helper(NULL, ast_str_buffer(query), buffer, bufsize); /* Line oriented output */ stringp = buffer; @@ -511,7 +511,7 @@ static int require_curl(const char *url, const char *unused, va_list ap) va_end(ap); ast_str_append(&query, 0, ")}"); - pbx_substitute_variables_helper(NULL, query->str, buffer, sizeof(buffer)); + pbx_substitute_variables_helper(NULL, ast_str_buffer(query), buffer, sizeof(buffer)); return atoi(buffer); } @@ -544,7 +544,7 @@ static struct ast_config *config_curl(const char *url, const char *unused, const ast_str_set(&query, 0, "${CURL(%s/static?file=%s)}", url, buf1); /* Do the CURL query */ - pbx_substitute_variables_helper(NULL, query->str, buffer, bufsize); + pbx_substitute_variables_helper(NULL, ast_str_buffer(query), buffer, bufsize); /* Line oriented output */ stringp = buffer; |