diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
| commit | 58818426d60d583c4becc6a99b398cbac1b7b12f (patch) | |
| tree | 5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_sql_postgres.c | |
| parent | a4d6ea67a7536e2cb2337527357ce6d3db8639f3 (diff) | |
Massive cleanups to applications for LOCAL_USER handling and some other things.
In general, LOCAL_USER_ADD/REMOVE should be the first/last thing called in an
application. An exception is if there is some *fast* setup code that might
halt the execution of the application, such as checking to see if an argument
exists.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6832 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_sql_postgres.c')
| -rwxr-xr-x | apps/app_sql_postgres.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/apps/app_sql_postgres.c b/apps/app_sql_postgres.c index 94dc8ea04..810e00f72 100755 --- a/apps/app_sql_postgres.c +++ b/apps/app_sql_postgres.c @@ -44,9 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "libpq-fe.h" -#define EXTRA_LOG 0 - - static char *tdesc = "Simple PostgreSQL Interface"; static char *app = "PGSQL"; @@ -501,23 +498,19 @@ static int aPGSQL_debug(struct ast_channel *chan, void *data) { ast_log(LOG_WARNING,"Debug : %s\n",(char *)data); return(0); } - - static int PGSQL_exec(struct ast_channel *chan, void *data) { struct localuser *u; int result; -#if EXTRA_LOG - printf("PRSQL_exec: data=%s\n",(char*)data); -#endif - - if (!data) { + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "APP_PGSQL requires an argument (see manual)\n"); return -1; } + LOCAL_USER_ADD(u); + result=0; if (strncasecmp("connect",data,strlen("connect"))==0) { @@ -540,8 +533,8 @@ static int PGSQL_exec(struct ast_channel *chan, void *data) } LOCAL_USER_REMOVE(u); + return result; - } int unload_module(void) |