sysmocom/asterisk
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Issue 6917 - some cleanups for res_config_pgsql.c (mithraen)

Browse source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson 2006-04-09 18:57:25 +00:00
parent 6843c5ddc6
commit 70f18e5f31
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
res/res_config_pgsql.c
View file

@ -46,11 +46,12 @@ static char *res_config_pgsql_desc = "Postgresql RealTime Configuration Driver";
AST_MUTEX_DEFINE_STATIC(pgsql_lock); AST_MUTEX_DEFINE_STATIC(pgsql_lock);
#define RES_CONFIG_PGSQL_CONF "res_pgsql.conf" #define RES_CONFIG_PGSQL_CONF "res_pgsql.conf"
PGconn* pgsqlConn = NULL; PGconn* pgsqlConn = NULL;
static char dbhost[50]=""; #define MAX_DB_OPTION_SIZE 64
static char dbuser[50]=""; static char dbhost[MAX_DB_OPTION_SIZE]="";
static char dbpass[50]=""; static char dbuser[MAX_DB_OPTION_SIZE]="";
static char dbname[50]=""; static char dbpass[MAX_DB_OPTION_SIZE]="";
static char dbsock[50]=""; static char dbname[MAX_DB_OPTION_SIZE]="";
static char dbsock[MAX_DB_OPTION_SIZE]="";
static int dbport=5432; static int dbport=5432;
static time_t connect_time=0; static time_t connect_time=0;
@ -99,8 +100,7 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab
/* Create the first part of the query using the first parameter/value pairs we just extracted /* Create the first part of the query using the first parameter/value pairs we just extracted
If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */ If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
op = strchr(newparam, ' ')?"":" =";
if(!strchr(newparam, ' ')) op = " ="; else op = "";
snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, newval); snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, newval);
while((newparam = va_arg(ap, const char *))) { while((newparam = va_arg(ap, const char *))) {
@ -159,8 +159,7 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab
} }
for(i = 0; i < numFields; i++) for(i = 0; i < numFields; i++)
fieldnames[i]=PQfname(result,i); fieldnames[i]=PQfname(result,i);
for(rowIndex=0;rowIndex<num_rows;rowIndex++) for(rowIndex = 0; rowIndex < num_rows; rowIndex++)
{
for(i = 0; i < numFields; i++) { for(i = 0; i < numFields; i++) {
stringp = PQgetvalue(result,rowIndex,i); stringp = PQgetvalue(result,rowIndex,i);
while(stringp) { while(stringp) {
@ -177,7 +176,6 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab
} }
} }
} }
}
free(fieldnames); free(fieldnames);
} else { } else {
ast_log(LOG_WARNING, "Postgresql RealTime: Could not find any rows in table %s.\n", table); ast_log(LOG_WARNING, "Postgresql RealTime: Could not find any rows in table %s.\n", table);
@ -698,10 +696,7 @@ static int pgsql_reconnect(const char *database)
{ {
char my_database[50]; char my_database[50];
if(!database || ast_strlen_zero(database)) ast_copy_string(my_database, S_OR(database,dbname), sizeof(my_database));
ast_copy_string(my_database, dbname, sizeof(my_database));
else
ast_copy_string(my_database, database, sizeof(my_database));
/* mutex lock should have been locked before calling this function. */ /* mutex lock should have been locked before calling this function. */