mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-20 12:20:12 +00:00
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: https://origsvn.digium.com/svn/asterisk/trunk@6832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user