kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdr_pgsql.cl: REFACTOR Macro LENGTHEN_BUF

Browse Source 
Remove repeated code on macro of assigned buffer to SQL vars.

Add table and connection name to log error message when is not possible
allocate memory.

Change-Id: I1fbf37d286a032d38fdda72a9f736356956c9ffe
This commit is contained in:
Rodrigo Ramírez Norambuena
2016-01-23 14:41:38 -03:00
parent 9a67730d79
commit 2fb45c7801
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cdr/cdr_pgsql.c
View File

@@ -101,12 +101,12 @@ struct columns {
static AST_RWLIST_HEAD_STATIC(psql_columns, columns); static AST_RWLIST_HEAD_STATIC(psql_columns, columns);
#define LENGTHEN_BUF1(size) \ #define LENGTHEN_BUF(size, var_sql) \
do { \ do { \
/* Lengthen buffer, if necessary */ \ /* Lengthen buffer, if necessary */ \
if (ast_str_strlen(sql) + size + 1 > ast_str_size(sql)) { \ if (ast_str_strlen(var_sql) + size + 1 > ast_str_size(var_sql)) { \
if (ast_str_make_space(&sql, ((ast_str_size(sql) + size + 3) / 512 + 1) * 512) != 0) { \ if (ast_str_make_space(&var_sql, ((ast_str_size(var_sql) + size + 3) / 512 + 1) * 512) != 0) { \
ast_log(LOG_ERROR, "Unable to allocate sufficient memory. Insert CDR failed.\n"); \ ast_log(LOG_ERROR, "Unable to allocate sufficient memory. Insert CDR '%s:%s' failed.\n", pghostname, table); \
ast_free(sql); \ ast_free(sql); \
ast_free(sql2); \ ast_free(sql2); \
AST_RWLIST_UNLOCK(&psql_columns); \ AST_RWLIST_UNLOCK(&psql_columns); \
@@ -116,19 +116,10 @@ static AST_RWLIST_HEAD_STATIC(psql_columns, columns);
} \ } \
} while (0) } while (0)
#define LENGTHEN_BUF1(size) \
LENGTHEN_BUF(size, sql);
#define LENGTHEN_BUF2(size) \ #define LENGTHEN_BUF2(size) \
do { \ LENGTHEN_BUF(size, sql2);
if (ast_str_strlen(sql2) + size + 1 > ast_str_size(sql2)) { \
if (ast_str_make_space(&sql2, ((ast_str_size(sql2) + size + 3) / 512 + 1) * 512) != 0) { \
ast_log(LOG_ERROR, "Unable to allocate sufficient memory. Insert CDR failed.\n"); \
ast_free(sql); \
ast_free(sql2); \
AST_RWLIST_UNLOCK(&psql_columns); \
ast_mutex_unlock(&pgsql_lock); \
return -1; \
} \
} \
} while (0)
/*! \brief Handle the CLI command cdr show pgsql status */ /*! \brief Handle the CLI command cdr show pgsql status */
static char *handle_cdr_pgsql_status(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_cdr_pgsql_status(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)