dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Cleanup formatting in app_math.c 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3896 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
citats 2004-10-03 15:59:52 +00:00
parent 30571fa227
commit f60cf13e7f
1 changed files with 100 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/app_math.c
View File

@ -41,15 +41,12 @@
#include <sys/file.h>
#include "../astconf.h"
static char *tdesc = "Basic maths functions";
static char *app_math = "Math";
static char *math_synopsis = "Performs Mathematical Functions";
static char *math_descrip =
"Math(returnvar,<number1><op><number 2>\n\n"
"Perform floating point calculation on number 1 to number 2 and \n"
@ -57,7 +54,6 @@ static char *math_descrip =
" +,-,/,*,%,<,>,>=,<=,==\n"
"and behave as their C equivalents. Always returns 0.\n";
#define ADDFUNCTION 0
#define DIVIDEFUNCTION 1
#define MULTIPLYFUNCTION 2
@ -70,14 +66,12 @@ static char *math_descrip =
#define LTEFUNCTION 8
#define EQFUNCTION 9
STANDARD_LOCAL_USER;
LOCAL_USER_DECL;
static int math_exec(struct ast_channel *chan, void *data) {
static int math_exec(struct ast_channel *chan, void *data)
{
float fnum1;
float fnum2;
float ftmp = 0;
@ -99,14 +93,11 @@ static int math_exec(struct ast_channel *chan, void *data) {
LOCAL_USER_ADD(u);
s = ast_strdupa((void *) data);
mvar = strsep(&s, "|");
mvalue1 = strsep(&s, "|");
if ((op = strchr(mvalue1, '+'))) {
iaction = ADDFUNCTION;
*op = '\0';
@ -149,7 +140,6 @@ static int math_exec(struct ast_channel *chan, void *data) {
if (op)
mvalue2 = op + 1;
if (!mvar || !mvalue1 || !mvalue2) {
ast_log(LOG_WARNING, "Supply all the parameters - just this once, please\n");
LOCAL_USER_REMOVE(u);
@ -162,7 +152,6 @@ static int math_exec(struct ast_channel *chan, void *data) {
return -1;
}
if (sscanf(mvalue1, "%f", &fnum1) != 1) {
ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue1);
LOCAL_USER_REMOVE(u);
@ -175,12 +164,10 @@ static int math_exec(struct ast_channel *chan, void *data) {
return -1;
}
switch (iaction) {
case ADDFUNCTION :
ftmp = fnum1 + fnum2;
break;
case DIVIDEFUNCTION :
if (fnum2 <=0)
ftmp = 0; /* can't do a divide by 0 */
@ -235,7 +222,6 @@ static int math_exec(struct ast_channel *chan, void *data) {
ast_log(LOG_WARNING, "Something happened that neither of us should be proud of %d\n", iaction);
LOCAL_USER_REMOVE(u);
return -1;
}
if (iaction < GTFUNCTION || iaction > EQFUNCTION)
@ -280,10 +266,4 @@ char *key()
return ASTERISK_GPL_KEY;
}
/* Fading everything to black and blue... */