diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-19 21:42:46 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-19 21:42:46 +0000 |
| commit | a343f7a275dd6cf3762cb42bdb7108fd7b0cfa07 (patch) | |
| tree | 3d2b6ec3c7b9411ab8529c172387a75dfdd2d053 /funcs | |
| parent | 1bd2376769465415348ca59d9995dd2250f852a7 (diff) | |
ast_str_SQLGetData is *not* part of the ast_str API, it's part of the ast_odbc API and just happens to use an ast_str as the buffer; move all of it to res_odbc.c and res_odbc.h, renaming appropriately
along the way fix some minor coding style issues in strings.h and add some attribute_pure annotations to functions in the ast_str API
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@169438 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_odbc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index e1006a2f8..e23dff5f2 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -30,7 +30,6 @@ <depend>res_odbc</depend> ***/ -#define USE_ODBC #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -543,7 +542,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha } buflen = strlen(buf); - res = ast_str_SQLGetData(&coldata, -1, stmt, x + 1, SQL_CHAR, &indicator); + res = ast_odbc_ast_str_SQLGetData(&coldata, -1, stmt, x + 1, SQL_CHAR, &indicator); if (indicator == SQL_NULL_DATA) { ast_debug(3, "Got NULL data\n"); ast_str_reset(coldata); @@ -1093,7 +1092,7 @@ static char *cli_odbc_read(struct ast_cli_entry *e, int cmd, struct ast_cli_args snprintf(colname, sizeof(colname), "field%d", x); } - res = ast_str_SQLGetData(&coldata, maxcol, stmt, x + 1, SQL_CHAR, &indicator); + res = ast_odbc_ast_str_SQLGetData(&coldata, maxcol, stmt, x + 1, SQL_CHAR, &indicator); if (indicator == SQL_NULL_DATA) { ast_str_set(&coldata, 0, "(nil)"); res = SQL_SUCCESS; |