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

220
apps/app_math.c
View File

@ -41,15 +41,12 @@
#include <sys/file.h> #include <sys/file.h>
#include "../astconf.h" #include "../astconf.h"
static char *tdesc = "Basic maths functions"; static char *tdesc = "Basic maths functions";
static char *app_math = "Math"; static char *app_math = "Math";
static char *math_synopsis = "Performs Mathematical Functions"; static char *math_synopsis = "Performs Mathematical Functions";
static char *math_descrip = static char *math_descrip =
"Math(returnvar,<number1><op><number 2>\n\n" "Math(returnvar,<number1><op><number 2>\n\n"
"Perform floating point calculation on number 1 to number 2 and \n" "Perform floating point calculation on number 1 to number 2 and \n"
@ -57,7 +54,6 @@ static char *math_descrip =
" +,-,/,*,%,<,>,>=,<=,==\n" " +,-,/,*,%,<,>,>=,<=,==\n"
"and behave as their C equivalents. Always returns 0.\n"; "and behave as their C equivalents. Always returns 0.\n";
#define ADDFUNCTION 0 #define ADDFUNCTION 0
#define DIVIDEFUNCTION 1 #define DIVIDEFUNCTION 1
#define MULTIPLYFUNCTION 2 #define MULTIPLYFUNCTION 2
@ -70,16 +66,14 @@ static char *math_descrip =
#define LTEFUNCTION 8 #define LTEFUNCTION 8
#define EQFUNCTION 9 #define EQFUNCTION 9
STANDARD_LOCAL_USER; STANDARD_LOCAL_USER;
LOCAL_USER_DECL; 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 fnum1;
float fnum2; float fnum2;
float ftmp = 0; float ftmp = 0;
char *op; char *op;
int iaction=-1; int iaction=-1;
@ -87,25 +81,22 @@ static int math_exec(struct ast_channel *chan, void *data) {
/* dunno, big calulations :D */ /* dunno, big calulations :D */
char user_result[30]; char user_result[30];
char *s; char *s;
char *mvar, *mvalue1, *mvalue2=NULL; char *mvar, *mvalue1, *mvalue2=NULL;
struct localuser *u; struct localuser *u;
if (!data) { if (!data) {
ast_log(LOG_WARNING, "No parameters passed. !\n"); ast_log(LOG_WARNING, "No parameters passed. !\n");
return -1; return -1;
} }
LOCAL_USER_ADD(u); LOCAL_USER_ADD(u);
s = ast_strdupa((void *) data); s = ast_strdupa((void *) data);
mvar = strsep(&s, "|"); mvar = strsep(&s, "|");
mvalue1 = strsep(&s, "|"); mvalue1 = strsep(&s, "|");
if ((op = strchr(mvalue1, '+'))) { if ((op = strchr(mvalue1, '+'))) {
iaction = ADDFUNCTION; iaction = ADDFUNCTION;
@ -149,94 +140,89 @@ static int math_exec(struct ast_channel *chan, void *data) {
if (op) if (op)
mvalue2 = op + 1; mvalue2 = op + 1;
if (!mvar || !mvalue1 || !mvalue2) { if (!mvar || !mvalue1 || !mvalue2) {
ast_log(LOG_WARNING, "Supply all the parameters - just this once, please\n"); ast_log(LOG_WARNING, "Supply all the parameters - just this once, please\n");
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return -1;
}
if (!strcmp(mvar,"")) {
ast_log(LOG_WARNING, "No return variable set.\n");
LOCAL_USER_REMOVE(u);
return -1; return -1;
} }
if (!strcmp(mvar,"")) {
ast_log(LOG_WARNING, "No return variable set.\n");
LOCAL_USER_REMOVE(u);
return -1;
}
if (sscanf(mvalue1, "%f", &fnum1) != 1) { if (sscanf(mvalue1, "%f", &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);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return -1; return -1;
} }
if (sscanf(mvalue2, "%f", &fnum2) != 1) { if (sscanf(mvalue2, "%f", &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);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return -1; return -1;
} }
switch (iaction) {
switch (iaction) { case ADDFUNCTION :
case ADDFUNCTION : ftmp = fnum1 + fnum2;
ftmp = fnum1 + fnum2; break;
break; case DIVIDEFUNCTION :
if (fnum2 <=0)
case DIVIDEFUNCTION : ftmp = 0; /* can't do a divide by 0 */
if (fnum2 <=0) else
ftmp = 0; /* can't do a divide by 0 */ ftmp = (fnum1 / fnum2);
else break;
ftmp = (fnum1 / fnum2); case MULTIPLYFUNCTION :
break; ftmp = (fnum1 * fnum2);
case MULTIPLYFUNCTION : break;
ftmp = (fnum1 * fnum2); case SUBTRACTFUNCTION :
break; ftmp = (fnum2 - fnum1);
case SUBTRACTFUNCTION : break;
ftmp = (fnum2 - fnum1); case MODULUSFUNCTION : {
break; int inum1 = fnum1;
case MODULUSFUNCTION : { int inum2 = fnum2;
int inum1 = fnum1;
int inum2 = fnum2;
ftmp = (inum1 % inum2); ftmp = (inum1 % inum2);
break; break;
} }
case GTFUNCTION : case GTFUNCTION :
if (fnum1 > fnum2) if (fnum1 > fnum2)
strncpy (user_result, "TRUE", sizeof (user_result) - 1); strncpy (user_result, "TRUE", sizeof (user_result) - 1);
else else
strncpy (user_result, "FALSE", sizeof (user_result) - 1); strncpy (user_result, "FALSE", sizeof (user_result) - 1);
break; break;
case LTFUNCTION : case LTFUNCTION :
if (fnum1 < fnum2) if (fnum1 < fnum2)
strncpy (user_result, "TRUE", sizeof (user_result) - 1); strncpy (user_result, "TRUE", sizeof (user_result) - 1);
else else
strncpy (user_result, "FALSE", sizeof (user_result) - 1); strncpy (user_result, "FALSE", sizeof (user_result) - 1);
break; break;
case GTEFUNCTION : case GTEFUNCTION :
if (fnum1 >= fnum2) if (fnum1 >= fnum2)
strncpy (user_result, "TRUE", sizeof (user_result) - 1); strncpy (user_result, "TRUE", sizeof (user_result) - 1);
else else
strncpy (user_result, "FALSE", sizeof (user_result) - 1); strncpy (user_result, "FALSE", sizeof (user_result) - 1);
break; break;
case LTEFUNCTION : case LTEFUNCTION :
if (fnum1 <= fnum2) if (fnum1 <= fnum2)
strncpy (user_result, "TRUE", sizeof (user_result) - 1); strncpy (user_result, "TRUE", sizeof (user_result) - 1);
else else
strncpy (user_result, "FALSE", sizeof (user_result) - 1); strncpy (user_result, "FALSE", sizeof (user_result) - 1);
break; break;
case EQFUNCTION : case EQFUNCTION :
if (fnum1 == fnum2) if (fnum1 == fnum2)
strncpy (user_result, "TRUE", sizeof (user_result) - 1); strncpy (user_result, "TRUE", sizeof (user_result) - 1);
else else
strncpy (user_result, "FALSE", sizeof (user_result) - 1); strncpy (user_result, "FALSE", sizeof (user_result) - 1);
break; break;
default : default :
ast_log(LOG_WARNING, "Something happened that neither of us should be proud of %d\n", iaction); ast_log(LOG_WARNING, "Something happened that neither of us should be proud of %d\n", iaction);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return -1; return -1;
}
}
if (iaction < GTFUNCTION || iaction > EQFUNCTION) if (iaction < GTFUNCTION || iaction > EQFUNCTION)
snprintf(user_result,sizeof(user_result),"%f",ftmp); snprintf(user_result,sizeof(user_result),"%f",ftmp);
@ -244,23 +230,23 @@ static int math_exec(struct ast_channel *chan, void *data) {
pbx_builtin_setvar_helper(chan, mvar, user_result); pbx_builtin_setvar_helper(chan, mvar, user_result);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return 0; return 0;
} }
int unload_module(void) int unload_module(void)
{ {
int res; int res;
STANDARD_HANGUP_LOCALUSERS; STANDARD_HANGUP_LOCALUSERS;
res = ast_unregister_application(app_math); res = ast_unregister_application(app_math);
return res; return res;
} }
int load_module(void) int load_module(void)
{ {
int res; int res;
res = ast_register_application(app_math, math_exec, math_synopsis, math_descrip); res = ast_register_application(app_math, math_exec, math_synopsis, math_descrip);
return res; return res;
} }
char *description(void) char *description(void)
@ -280,10 +266,4 @@ char *key()
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }
/* Fading everything to black and blue... */ /* Fading everything to black and blue... */