automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@67208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Automerge Script 18 years ago
parent 8120d0bb68
commit 7699bb25d7

@ -67,9 +67,9 @@ static char *builtin_function_math(struct ast_channel *chan, char *cmd, char *da
int argc; int argc;
char *argv[2]; char *argv[2];
char *args; char *args;
float fnum1; double fnum1;
float fnum2; double fnum2;
float ftmp = 0; double ftmp = 0;
char *op; char *op;
int iaction=-1; int iaction=-1;
int type_of_result=FLOAT_RESULT; int type_of_result=FLOAT_RESULT;
@ -159,12 +159,12 @@ static char *builtin_function_math(struct ast_channel *chan, char *cmd, char *da
return NULL; return NULL;
} }
if (sscanf(mvalue1, "%f", &fnum1) != 1) { if (sscanf(mvalue1, "%lf", &fnum1) != 1) {
ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue1); ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue1);
return NULL; return NULL;
} }
if (sscanf(mvalue2, "%f", &fnum2) != 1) { if (sscanf(mvalue2, "%lf", &fnum2) != 1) {
ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue2); ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue2);
return NULL; return NULL;
} }

Loading…
Cancel
Save