diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/res_config_pgsql.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index e68068cd0..b59dc5521 100644 --- a/res/res_config_pgsql.c +++ b/res/res_config_pgsql.c @@ -252,8 +252,8 @@ static struct tables *find_table(const char *database, const char *orig_tablenam struct columns *column; struct tables *table; struct ast_str *sql = ast_str_thread_get(&findtable_buf, 330); - PGresult *result; - int exec_result; + RAII_VAR(PGresult *, result, NULL, PQclear); + int exec_result; char *fname, *ftype, *flen, *fnotnull, *fdef; int i, rows; @@ -339,14 +339,12 @@ static struct tables *find_table(const char *database, const char *orig_tablenam ast_debug(1, "Query of table structure complete. Now retrieving results.\n"); if (exec_result != 0) { ast_log(LOG_ERROR, "Failed to query database columns for table %s\n", orig_tablename); - PQclear(result); AST_LIST_UNLOCK(&psql_tables); return NULL; } if (!(table = ast_calloc(1, sizeof(*table) + strlen(orig_tablename) + 1))) { ast_log(LOG_ERROR, "Unable to allocate memory for new table structure\n"); - PQclear(result); AST_LIST_UNLOCK(&psql_tables); return NULL; } @@ -365,7 +363,6 @@ static struct tables *find_table(const char *database, const char *orig_tablenam if (!(column = ast_calloc(1, sizeof(*column) + strlen(fname) + strlen(ftype) + 2))) { ast_log(LOG_ERROR, "Unable to allocate column element for %s, %s\n", orig_tablename, fname); - PQclear(result); destroy_table(table); AST_LIST_UNLOCK(&psql_tables); return NULL; @@ -395,7 +392,6 @@ static struct tables *find_table(const char *database, const char *orig_tablenam } AST_LIST_INSERT_TAIL(&table->columns, column, list); } - PQclear(result); AST_LIST_INSERT_TAIL(&psql_tables, table, list); ast_rwlock_rdlock(&table->lock); @@ -420,7 +416,7 @@ static struct columns *find_column(struct tables *t, const char *colname) static struct ast_variable *realtime_pgsql(const char *database, const char *tablename, const struct ast_variable *fields) { - PGresult *result = NULL; + RAII_VAR(PGresult *, result, NULL, PQclear); int num_rows = 0, pgresult; struct ast_str *sql = ast_str_thread_get(&sql_buf, 100); struct ast_str *escapebuf = ast_str_thread_get(&escapebuf_buf, 100); @@ -482,7 +478,6 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab ast_mutex_lock(&pgsql_lock); if (pgsql_exec(database, tablename, ast_str_buffer(sql), &result) != 0) { - PQclear(result); ast_mutex_unlock(&pgsql_lock); return NULL; } @@ -498,7 +493,6 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab ast_debug(1, "PostgreSQL RealTime: Found %d rows.\n", num_rows); if (!(fieldnames = ast_calloc(1, numFields * sizeof(char *)))) { - PQclear(result); ast_mutex_unlock(&pgsql_lock); return NULL; } @@ -527,7 +521,6 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab ast_debug(1, "Postgresql RealTime: Could not find any rows in table %s@%s.\n", tablename, database); } - PQclear(result); ast_mutex_unlock(&pgsql_lock); return var; @@ -535,7 +528,7 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab static struct ast_config *realtime_multi_pgsql(const char *database, const char *table, const struct ast_variable *fields) { - PGresult *result = NULL; + RAII_VAR(PGresult *, result, NULL, PQclear); int num_rows = 0, pgresult; struct ast_str *sql = ast_str_thread_get(&sql_buf, 100); struct ast_str *escapebuf = ast_str_thread_get(&escapebuf_buf, 100); @@ -633,7 +626,6 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char ast_debug(1, "PostgreSQL RealTime: Query: %s\n", ast_str_buffer(sql)); ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s (%s)\n", PQresultErrorMessage(result), PQresStatus(result_status)); - PQclear(result); ast_mutex_unlock(&pgsql_lock); ast_config_destroy(cfg); return NULL; @@ -651,7 +643,6 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char ast_debug(1, "PostgreSQL RealTime: Found %d rows.\n", num_rows); if (!(fieldnames = ast_calloc(1, numFields * sizeof(char *)))) { - PQclear(result); ast_mutex_unlock(&pgsql_lock); ast_config_destroy(cfg); return NULL; @@ -683,7 +674,6 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char ast_debug(1, "PostgreSQL RealTime: Could not find any rows in table %s.\n", table); } - PQclear(result); ast_mutex_unlock(&pgsql_lock); return cfg; @@ -692,7 +682,7 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char static int update_pgsql(const char *database, const char *tablename, const char *keyfield, const char *lookup, const struct ast_variable *fields) { - PGresult *result = NULL; + RAII_VAR(PGresult *, result, NULL, PQclear); int numrows = 0, pgresult; const struct ast_variable *field = fields; struct ast_str *sql = ast_str_thread_get(&sql_buf, 100); @@ -795,7 +785,6 @@ static int update_pgsql(const char *database, const char *tablename, const char ast_debug(1, "PostgreSQL RealTime: Query: %s\n", ast_str_buffer(sql)); ast_debug(1, "PostgreSQL RealTime: Query Failed because: %s (%s)\n", PQresultErrorMessage(result), PQresStatus(result_status)); - PQclear(result); ast_mutex_unlock(&pgsql_lock); return -1; } @@ -820,7 +809,7 @@ static int update_pgsql(const char *database, const char *tablename, const char static int update2_pgsql(const char *database, const char *tablename, const struct ast_variable *lookup_fields, const struct ast_variable *update_fields) { - PGresult *result = NULL; + RAII_VAR(PGresult *, result, NULL, PQclear); int numrows = 0, pgresult, first = 1; struct ast_str *escapebuf = ast_str_thread_get(&escapebuf_buf, 16); const struct ast_variable *field; @@ -932,7 +921,7 @@ static int update2_pgsql(const char *database, const char *tablename, const stru static int store_pgsql(const char *database, const char *table, const struct ast_variable *fields) { - PGresult *result = NULL; + RAII_VAR(PGresult *, result, NULL, PQclear); Oid insertid; struct ast_str *buf = ast_str_thread_get(&escapebuf_buf, 256); struct ast_str *sql1 = ast_str_thread_get(&sql_buf, 256); @@ -991,7 +980,6 @@ static int store_pgsql(const char *database, const char *table, const struct ast } insertid = PQoidValue(result); - PQclear(result); ast_mutex_unlock(&pgsql_lock); ast_debug(1, "PostgreSQL RealTime: row inserted on table: %s, id: %u\n", table, insertid); @@ -1010,7 +998,7 @@ static int store_pgsql(const char *database, const char *table, const struct ast static int destroy_pgsql(const char *database, const char *table, const char *keyfield, const char *lookup, const struct ast_variable *fields) { - PGresult *result = NULL; + RAII_VAR(PGresult *, result, NULL, PQclear); int numrows = 0; int pgresult; struct ast_str *sql = ast_str_thread_get(&sql_buf, 256); @@ -1091,7 +1079,7 @@ static struct ast_config *config_pgsql(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags flags, const char *suggested_incl, const char *who_asked) { - PGresult *result = NULL; + RAII_VAR(PGresult *, result, NULL, PQclear); long num_rows; struct ast_variable *new_v; struct ast_category *cur_cat = NULL; @@ -1138,7 +1126,6 @@ static struct ast_config *config_pgsql(const char *database, const char *table, char *field_cat_metric = PQgetvalue(result, rowIndex, 3); if (!strcmp(field_var_name, "#include")) { if (!ast_config_internal_load(field_var_val, cfg, flags, "", who_asked)) { - PQclear(result); ast_mutex_unlock(&pgsql_lock); return NULL; } @@ -1161,7 +1148,6 @@ static struct ast_config *config_pgsql(const char *database, const char *table, "PostgreSQL RealTime: Could not find config '%s' in database.\n", file); } - PQclear(result); ast_mutex_unlock(&pgsql_lock); return cfg; @@ -1281,7 +1267,7 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap ast_debug(1, "About to run ALTER query on table '%s' to add column '%s'\n", tablename, elm); if (pgsql_exec(database, tablename, ast_str_buffer(sql), &result) != 0) { - ast_mutex_unlock(&pgsql_lock); + ast_mutex_unlock(&pgsql_lock); return -1; } |