Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv12635/apps
Modified Files:
app_dial.c app_disa.c app_groupcount.c app_meetme.c
app_osplookup.c app_read.c app_readfile.c app_realtime.c
app_rpt.c app_voicemail.c
Log Message:
don't use '%i' at all, since we have no current use cases that need non base-10
parsing (bug #4110)
Index: app_dial.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_dial.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- app_dial.c 29 Apr 2005 15:04:26 -0000 1.151
+++ app_dial.c 29 Apr 2005 17:00:33 -0000 1.152
@@ -693,7 +693,7 @@
if ((cdl = strstr(transfer, "S("))) {
calldurationlimit=atoi(cdl+2);
if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Setting call
duration limit to %i seconds.\n",calldurationlimit);
+ ast_verbose(VERBOSE_PREFIX_3 "Setting call
duration limit to %d seconds.\n",calldurationlimit);
}
/* Extract DTMF strings to send upon successfull connect */
Index: app_disa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_disa.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- app_disa.c 21 Apr 2005 06:02:43 -0000 1.26
+++ app_disa.c 29 Apr 2005 17:00:33 -0000 1.27
@@ -143,8 +143,8 @@
ast_log(LOG_WARNING, "disa requires an argument
(passcode/passcode file)\n");
return -1;
}
- ast_log(LOG_DEBUG, "Digittimeout: %i\n", digittimeout);
- ast_log(LOG_DEBUG, "Responsetimeout: %i\n", firstdigittimeout);
+ ast_log(LOG_DEBUG, "Digittimeout: %d\n", digittimeout);
+ ast_log(LOG_DEBUG, "Responsetimeout: %d\n", firstdigittimeout);
strncpy(tmp, (char *)data, sizeof(tmp)-1);
stringp=tmp;
strsep(&stringp, "|");
Index: app_groupcount.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_groupcount.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- app_groupcount.c 27 Apr 2005 01:50:53 -0000 1.10
+++ app_groupcount.c 29 Apr 2005 17:00:33 -0000 1.11
@@ -114,7 +114,7 @@
ast_app_group_split_group(data, limit, sizeof(limit), category,
sizeof(category));
- if ((sscanf(limit, "%i", &max) == 1) && (max > -1)) {
+ if ((sscanf(limit, "%d", &max) == 1) && (max > -1)) {
count = ast_app_group_get_count(pbx_builtin_getvar_helper(chan,
category), category);
if (count > max) {
if (ast_exists_extension(chan, chan->context,
chan->exten, chan->priority + 101, chan->cid.cid_num))
Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- app_meetme.c 21 Apr 2005 06:02:43 -0000 1.95
+++ app_meetme.c 29 Apr 2005 17:00:33 -0000 1.96
@@ -464,7 +464,7 @@
/* Show all the users */
user = cnf->firstuser;
while(user) {
- ast_cli(fd, "User #: %i Channel: %s %s %s %s %s\n",
user->user_no, user->chan->name, (user->userflags & CONFFLAG_ADMIN) ? "(Admin)"
: "", (user->userflags & CONFFLAG_MONITOR) ? "(Listen only)" : "",
(user->adminflags & ADMINFLAG_MUTED) ? "(Admn Muted)" : "",
istalking(user->talking));
+ ast_cli(fd, "User #: %d Channel: %s %s %s %s %s\n",
user->user_no, user->chan->name, (user->userflags & CONFFLAG_ADMIN) ? "(Admin)"
: "", (user->userflags & CONFFLAG_MONITOR) ? "(Listen only)" : "",
(user->adminflags & ADMINFLAG_MUTED) ? "(Admn Muted)" : "",
istalking(user->talking));
user = user->nextuser;
}
ast_cli(fd,"%d users in that conference.\n",cnf->users);
@@ -535,7 +535,7 @@
/* Search for the user */
usr = cnf->firstuser;
while(usr) {
- snprintf(usrno, sizeof(usrno), "%i",
usr->user_no);
+ snprintf(usrno, sizeof(usrno), "%d",
usr->user_no);
if (!strncasecmp(word, usrno,
strlen(word))) {
if (++which > state)
break;
@@ -839,7 +839,7 @@
"Channel: %s\r\n"
"Uniqueid: %s\r\n"
"Meetme: %s\r\n"
- "Usernum: %i\r\n",
+ "Usernum: %d\r\n",
chan->name, chan->uniqueid, conf->confno,
user->user_no);
if (!firstpass && !(confflags & CONFFLAG_MONITOR) && !(confflags &
CONFFLAG_ADMIN)) {
@@ -1047,7 +1047,7 @@
"Channel:
%s\r\n"
"Uniqueid:
%s\r\n"
"Meetme: %s\r\n"
- "Usernum:
%i\r\n",
+ "Usernum:
%d\r\n",
chan->name,
chan->uniqueid, conf->confno, user->user_no);
}
if (user->talking &&
totalsilence > MEETME_DELAYDETECTENDTALK) {
@@ -1056,7 +1056,7 @@
"Channel:
%s\r\n"
"Uniqueid:
%s\r\n"
"Meetme: %s\r\n"
- "Usernum:
%i\r\n",
+ "Usernum:
%d\r\n",
chan->name,
chan->uniqueid, conf->confno, user->user_no);
}
}
@@ -1273,7 +1273,7 @@
"Channel: %s\r\n"
"Uniqueid: %s\r\n"
"Meetme: %s\r\n"
- "Usernum: %i\r\n",
+ "Usernum: %d\r\n",
chan->name, chan->uniqueid, conf->confno,
user->user_no);
prev = NULL;
conf->users--;
@@ -1340,7 +1340,7 @@
}
}
/* Return the number of seconds the user was in the conf */
- snprintf(meetmesecs, sizeof(meetmesecs), "%i", (int)
(time(NULL) - user->jointime));
+ snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int)
(time(NULL) - user->jointime));
pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
}
free(user);
@@ -1451,7 +1451,7 @@
if (localdata && !ast_strlen_zero(localdata)){
/* have var so load it and exit */
- snprintf(val,sizeof(val), "%i",count);
+ snprintf(val,sizeof(val), "%d",count);
pbx_builtin_setvar_helper(chan, localdata,val);
} else {
if (chan->_state != AST_STATE_UP)
@@ -1706,7 +1706,7 @@
if (conf && callerident) {
user = conf->firstuser;
while(user) {
- snprintf(usrno, sizeof(usrno), "%i", user->user_no);
+ snprintf(usrno, sizeof(usrno), "%d", user->user_no);
if (strcmp(usrno, callerident) == 0)
return user;
user = user->nextuser;
Index: app_osplookup.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_osplookup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- app_osplookup.c 21 Apr 2005 06:02:43 -0000 1.6
+++ app_osplookup.c 29 Apr 2005 17:00:33 -0000 1.7
@@ -150,7 +150,7 @@
cause = str2cause((char *)data);
temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
result.handle = -1;
- if (temp && strlen(temp) && (sscanf(temp, "%i", &result.handle) == 1)
&& (result.handle > -1)) {
+ if (temp && strlen(temp) && (sscanf(temp, "%d", &result.handle) == 1)
&& (result.handle > -1)) {
if ((res = ast_osp_next(&result, cause)) > 0) {
char tmp[80];
snprintf(tmp, sizeof(tmp), "%d", result.handle);
@@ -203,7 +203,7 @@
cause = str2cause((char *)data);
temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
result.handle = -1;
- if (temp && strlen(temp) && (sscanf(temp, "%i", &result.handle) == 1)
&& (result.handle > -1)) {
+ if (temp && strlen(temp) && (sscanf(temp, "%d", &result.handle) == 1)
&& (result.handle > -1)) {
if (!ast_osp_terminate(result.handle, cause, start, duration)) {
pbx_builtin_setvar_helper(chan, "_OSPHANDLE", "");
res = 1;
Index: app_read.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_read.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- app_read.c 21 Apr 2005 06:02:43 -0000 1.17
+++ app_read.c 29 Apr 2005 17:00:33 -0000 1.18
@@ -119,7 +119,7 @@
if ((maxdigits<1) || (maxdigits>255)) {
maxdigits = 255;
} else if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Accepting a maximum of %i
digits.\n", maxdigits);
+ ast_verbose(VERBOSE_PREFIX_3 "Accepting a maximum of %d
digits.\n", maxdigits);
}
if (!(varname) || ast_strlen_zero(varname)) {
ast_log(LOG_WARNING, "Invalid! Usage:
Read(variable[|filename][|maxdigits][|option][|attempts][|timeout])\n\n");
Index: app_readfile.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_readfile.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- app_readfile.c 21 Apr 2005 06:02:43 -0000 1.2
+++ app_readfile.c 29 Apr 2005 17:00:33 -0000 1.3
@@ -78,7 +78,7 @@
if(len < strlen(returnvar))
returnvar[len]='\0';
else
- ast_log(LOG_WARNING,"%s is longer than %i, and %i
\n",file,len,strlen(returnvar));
+ ast_log(LOG_WARNING,"%s is longer than %d, and %d
\n",file,len,strlen(returnvar));
}
pbx_builtin_setvar_helper(chan, varname, returnvar);
free(returnvar);
Index: app_realtime.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_realtime.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- app_realtime.c 22 Apr 2005 03:29:03 -0000 1.8
+++ app_realtime.c 29 Apr 2005 17:00:33 -0000 1.9
@@ -87,7 +87,7 @@
return RESULT_SUCCESS;
}
- ast_cli(fd, "Updated %i RealTime record(s).\n", res);
+ ast_cli(fd, "Updated %d RealTime record(s).\n", res);
return RESULT_SUCCESS;
}
Index: app_rpt.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_rpt.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- app_rpt.c 21 Apr 2005 06:02:43 -0000 1.30
+++ app_rpt.c 29 Apr 2005 17:00:33 -0000 1.31
@@ -347,7 +347,7 @@
int ret;
if (str == NULL) return -1;
- if (sscanf(str,"%i",&ret) != 1) return -1;
+ if (sscanf(str,"%d",&ret) != 1) return -1;
return ret;
}
Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- app_voicemail.c 27 Apr 2005 01:37:46 -0000 1.208
+++ app_voicemail.c 29 Apr 2005 17:00:33 -0000 1.209
@@ -859,7 +859,7 @@
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
goto yuck;
}
- if (sscanf(rowdata, "%i", &x) != 1)
+ if (sscanf(rowdata, "%d", &x) != 1)
ast_log(LOG_WARNING, "Failed to read message count!\n");
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
} else
@@ -920,7 +920,7 @@
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
goto yuck;
}
- if (sscanf(rowdata, "%i", &x) != 1)
+ if (sscanf(rowdata, "%d", &x) != 1)
ast_log(LOG_WARNING, "Failed to read message count!\n");
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
} else
@@ -4072,7 +4072,7 @@
vm_change_password(vmu,newpassword);
else
vm_change_password_shell(vmu,newpassword);
- ast_log(LOG_DEBUG,"User %s set password to %s of length
%i\n",vms->username,newpassword,(int)strlen(newpassword));
+ ast_log(LOG_DEBUG,"User %s set password to %s of length
%d\n",vms->username,newpassword,(int)strlen(newpassword));
cmd = ast_play_and_wait(chan,"vm-passchanged");
/* If forcename is set, have the user record their name */
@@ -4174,7 +4174,7 @@
vm_change_password(vmu,newpassword);
else
vm_change_password_shell(vmu,newpassword);
- ast_log(LOG_DEBUG,"User %s set password to %s of length
%i\n",vms->username,newpassword,(int)strlen(newpassword));
+ ast_log(LOG_DEBUG,"User %s set password to %s of length
%d\n",vms->username,newpassword,(int)strlen(newpassword));
cmd = ast_play_and_wait(chan,"vm-passchanged");
break;
case '*':
_______________________________________________
Asterisk-Cvs mailing list
Asterisk-Cvs@lists.digium.com
http://lists.digium.com/mailman/listinfo/asterisk-cvs
