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

Merge rgagnon's pedantic string changes (apps n-z) (bug #2038)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3429 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-07-14 07:34:34 +00:00
parent 4d32c46126
commit 872685d088
13 changed files with 384 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/app_sql_postgres.c
View File

@@ -210,8 +210,8 @@ static int del_identifier(int identifier,int identifier_type) {
static int aPGSQL_connect(struct ast_channel *chan, void *data) {
char *s1,*s4;
char s[100];
char *s1;
char s[100] = "";
char *optionstring;
char *var;
int l;
@@ -224,7 +224,7 @@ static int aPGSQL_connect(struct ast_channel *chan, void *data) {
res=0;
l=strlen(data)+2;
s1=malloc(l);
strncpy(s1,data,l);
strncpy(s1, data, l -1);
stringp=s1;
strsep(&stringp," "); // eat the first token, we already know it :P
var=strsep(&stringp," ");
@@ -238,8 +238,7 @@ static int aPGSQL_connect(struct ast_channel *chan, void *data) {
} else {
ast_log(LOG_WARNING,"adding identifier\n");
id=add_identifier(AST_PGSQL_ID_CONNID,karoto);
s4=&s[0];
sprintf(s4,"%d",id);
snprintf(s, sizeof(s), "%d", id);
pbx_builtin_setvar_helper(chan,var,s);
}
@@ -250,8 +249,8 @@ static int aPGSQL_connect(struct ast_channel *chan, void *data) {
static int aPGSQL_query(struct ast_channel *chan, void *data) {
char *s1,*s2,*s3,*s4,*s5;
char s[100];
char *s1,*s2,*s3,*s4;
char s[100] = "";
char *querystring;
char *var;
int l;
@@ -266,7 +265,7 @@ static int aPGSQL_query(struct ast_channel *chan, void *data) {
l=strlen(data)+2;
s1=malloc(l);
s2=malloc(l);
strcpy(s1,data);
strncpy(s1, data, l - 1);
stringp=s1;
strsep(&stringp," "); // eat the first token, we already know it :P
s3=strsep(&stringp," ");
@@ -295,8 +294,7 @@ static int aPGSQL_query(struct ast_channel *chan, void *data) {
}
nres=PQnfields(PGSQLres);
id1=add_identifier(AST_PGSQL_ID_RESID,PGSQLres);
s5=&s[0];
sprintf(s5,"%d",id1);
snprintf(s, sizeof(s), "%d", id1);
pbx_builtin_setvar_helper(chan,var,s);
break;
}
@@ -330,7 +328,7 @@ static int aPGSQL_fetch(struct ast_channel *chan, void *data) {
s7=NULL;
s1=malloc(l);
s2=malloc(l);
strcpy(s1,data);
strncpy(s1, data, l - 1);
stringp=s1;
strsep(&stringp," "); // eat the first token, we already know it :P
fetchid_var=strsep(&stringp," ");
@@ -391,8 +389,7 @@ static int aPGSQL_fetch(struct ast_channel *chan, void *data) {
ast_log(LOG_WARNING,"ast_PGSQL_fetch : EOF\n");
id1 = 0; // no more rows
}
s5=&s[0];
sprintf(s5,"%d",id1);
snprintf(s, sizeof(s), "%d", id1);
ast_log(LOG_WARNING,"Setting var '%s' to value '%s'\n",fetchid_var,s);
pbx_builtin_setvar_helper(chan,fetchid_var,s);
break;
@@ -414,7 +411,7 @@ static int aPGSQL_reset(struct ast_channel *chan, void *data) {
l=strlen(data)+2;
s1=malloc(l);
strcpy(s1,data);
strncpy(s1, data, l - 1);
stringp=s1;
strsep(&stringp," "); // eat the first token, we already know it :P
s3=strsep(&stringp," ");
@@ -440,7 +437,7 @@ static int aPGSQL_clear(struct ast_channel *chan, void *data) {
l=strlen(data)+2;
s1=malloc(l);
strcpy(s1,data);
strncpy(s1, data, l - 1);
stringp=s1;
strsep(&stringp," "); // eat the first token, we already know it :P
s3=strsep(&stringp," ");
@@ -470,7 +467,7 @@ static int aPGSQL_disconnect(struct ast_channel *chan, void *data) {
l=strlen(data)+2;
s1=malloc(l);
strcpy(s1,data);
strncpy(s1, data, l - 1);
stringp=s1;
strsep(&stringp," "); // eat the first token, we already know it :P
s3=strsep(&stringp," ");