Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv12635/res
Modified Files:
res_features.c res_osp.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: res_features.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_features.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- res_features.c 27 Apr 2005 03:58:40 -0000 1.50
+++ res_features.c 29 Apr 2005 17:00:33 -0000 1.51
@@ -1571,7 +1571,7 @@
} else
parkingtime = parkingtime * 1000;
} else if (!strcasecmp(var->name, "parkpos")) {
- if (sscanf(var->value, "%i-%i", &start, &end)
!= 2) {
+ if (sscanf(var->value, "%d-%d", &start, &end)
!= 2) {
ast_log(LOG_WARNING, "Format for
parking positions is a-b, where a and b are numbers at line %d of
parking.conf\n", var->lineno);
} else {
parking_start = start;
Index: res_osp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_osp.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- res_osp.c 21 Apr 2005 06:02:44 -0000 1.13
+++ res_osp.c 29 Apr 2005 17:00:33 -0000 1.14
@@ -151,22 +151,22 @@
} else
ast_log(LOG_WARNING, "Too many Service points
at line %d\n", v->lineno);
} else if (!strcasecmp(v->name, "maxconnections")) {
- if ((sscanf(v->value, "%i", &x) == 1) && (x > 0) && (x
<= 1000)) {
+ if ((sscanf(v->value, "%d", &x) == 1) && (x > 0) && (x
<= 1000)) {
osp->maxconnections = x;
} else
ast_log(LOG_WARNING, "maxconnections should be
an integer from 1 to 1000, not '%s' at line %d\n", v->value, v->lineno);
} else if (!strcasecmp(v->name, "retrydelay")) {
- if ((sscanf(v->value, "%i", &x) == 1) && (x >= 0) && (x
<= 10)) {
+ if ((sscanf(v->value, "%d", &x) == 1) && (x >= 0) && (x
<= 10)) {
osp->retrydelay = x;
} else
ast_log(LOG_WARNING, "retrydelay should be an
integer from 0 to 10, not '%s' at line %d\n", v->value, v->lineno);
} else if (!strcasecmp(v->name, "retrylimit")) {
- if ((sscanf(v->value, "%i", &x) == 1) && (x >= 0) && (x
<= 100)) {
+ if ((sscanf(v->value, "%d", &x) == 1) && (x >= 0) && (x
<= 100)) {
osp->retrylimit = x;
} else
ast_log(LOG_WARNING, "retrylimit should be an
integer from 0 to 100, not '%s' at line %d\n", v->value, v->lineno);
} else if (!strcasecmp(v->name, "timeout")) {
- if ((sscanf(v->value, "%i", &x) == 1) && (x >= 200) &&
(x <= 10000)) {
+ if ((sscanf(v->value, "%d", &x) == 1) && (x >= 200) &&
(x <= 10000)) {
osp->timeout = x;
} else
ast_log(LOG_WARNING, "timeout should be an
integer from 200 to 10000, not '%s' at line %d\n", v->value, v->lineno);
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
