major dialplan functions update

deprecate LANGUAGE() and MUSICCLASS(), in favor of CHANNEL()


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9674 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 102 insertions, 108 deletions

diff --git a/funcs/func_math.c b/funcs/func_math.c
index 4ae62499f..7ad4765c6 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 2004 - 2005, Andy Powell 
+ * Copyright (C) 2004 - 2006, Andy Powell 
  *
  * Updated by Mark Spencer <markster@digium.com>
  *
@@ -18,7 +18,7 @@
 
 /*! \file
  *
- * \brief Maths relatad dialplan functions
+ * \brief Math related dialplan function
  *
  * \author Andy Powell
  * \author Mark Spencer <markster@digium.com>
@@ -41,65 +41,55 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/config.h"
 
-enum TypeOfFunctions
-{
-    ADDFUNCTION,
-    DIVIDEFUNCTION,
-    MULTIPLYFUNCTION,
-    SUBTRACTFUNCTION,
-    MODULUSFUNCTION,
-    GTFUNCTION,
-    LTFUNCTION,
-    GTEFUNCTION,
-    LTEFUNCTION,
-    EQFUNCTION
+enum TypeOfFunctions {
+	ADDFUNCTION,
+	DIVIDEFUNCTION,
+	MULTIPLYFUNCTION,
+	SUBTRACTFUNCTION,
+	MODULUSFUNCTION,
+	GTFUNCTION,
+	LTFUNCTION,
+	GTEFUNCTION,
+	LTEFUNCTION,
+	EQFUNCTION
 };
 
-enum TypeOfResult
-{
-    FLOAT_RESULT,
-    INT_RESULT,
-    HEX_RESULT,
-    CHAR_RESULT
+enum TypeOfResult {
+	FLOAT_RESULT,
+	INT_RESULT,
+	HEX_RESULT,
+	CHAR_RESULT
 };
 
-
-static char *math(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) 
+static int math(struct ast_channel *chan, char *cmd, char *parse,
+		char *buf, size_t len)
 {
 	float fnum1;
 	float fnum2;
 	float ftmp = 0;
 	char *op;
-	int iaction=-1;
-	int type_of_result=FLOAT_RESULT;
-	char *parse;
-	
-	/* dunno, big calulations :D */
-	char user_result[30];
-
-	char *mvalue1, *mvalue2=NULL, *mtype_of_result;
-	
+	int iaction = -1;
+	int type_of_result = FLOAT_RESULT;
+	char *mvalue1, *mvalue2 = NULL, *mtype_of_result;
 	AST_DECLARE_APP_ARGS(args,
-		AST_APP_ARG(argv0);
-		AST_APP_ARG(argv1);
+			     AST_APP_ARG(argv0);
+			     AST_APP_ARG(argv1);
 	);
-	if (ast_strlen_zero(data)) {
+
+	if (ast_strlen_zero(parse)) {
 		ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
-		return NULL;
+		return -1;
 	}
 
-	if (!(parse = ast_strdupa(data)))
-		return NULL;
-
 	AST_STANDARD_APP_ARGS(args, parse);
-	
+
 	if (args.argc < 1) {
 		ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
-		return NULL;
+		return -1;
 	}
 
 	mvalue1 = args.argv0;
-	
+
 	if ((op = strchr(mvalue1, '+'))) {
 		iaction = ADDFUNCTION;
 		*op = '\0';
@@ -118,123 +108,127 @@ static char *math(struct ast_channel *chan, char *cmd, char *data, char *buf, si
 	} else if ((op = strchr(mvalue1, '>'))) {
 		iaction = GTFUNCTION;
 		*op = '\0';
-		if (*(op+1) == '=') {
+		if (*(op + 1) == '=') {
 			*++op = '\0';
 			iaction = GTEFUNCTION;
 		}
 	} else if ((op = strchr(mvalue1, '<'))) {
 		iaction = LTFUNCTION;
 		*op = '\0';
-		if (*(op+1) == '=') {
+		if (*(op + 1) == '=') {
 			*++op = '\0';
 			iaction = LTEFUNCTION;
 		}
 	} else if ((op = strchr(mvalue1, '='))) {
 		iaction = GTFUNCTION;
 		*op = '\0';
-		if (*(op+1) == '=') {
+		if (*(op + 1) == '=') {
 			*++op = '\0';
 			iaction = EQFUNCTION;
 		} else
 			op = NULL;
-	} 
-	
-	if (op) 
+	}
+
+	if (op)
 		mvalue2 = op + 1;
 
 	/* detect wanted type of result */
 	mtype_of_result = args.argv1;
-	if (mtype_of_result)
-	{
-		if (!strcasecmp(mtype_of_result,"float") || !strcasecmp(mtype_of_result,"f"))
-			type_of_result=FLOAT_RESULT;
-		else if (!strcasecmp(mtype_of_result,"int") || !strcasecmp(mtype_of_result,"i"))
-			type_of_result=INT_RESULT;
-		else if (!strcasecmp(mtype_of_result,"hex") || !strcasecmp(mtype_of_result,"h"))
-			type_of_result=HEX_RESULT;
-		else if (!strcasecmp(mtype_of_result,"char") || !strcasecmp(mtype_of_result,"c"))
-			type_of_result=CHAR_RESULT;
-		else
-		{
-			ast_log(LOG_WARNING, "Unknown type of result requested '%s'.\n", mtype_of_result);
-			return NULL;
+	if (mtype_of_result) {
+		if (!strcasecmp(mtype_of_result, "float")
+		    || !strcasecmp(mtype_of_result, "f"))
+			type_of_result = FLOAT_RESULT;
+		else if (!strcasecmp(mtype_of_result, "int")
+			 || !strcasecmp(mtype_of_result, "i"))
+			type_of_result = INT_RESULT;
+		else if (!strcasecmp(mtype_of_result, "hex")
+			 || !strcasecmp(mtype_of_result, "h"))
+			type_of_result = HEX_RESULT;
+		else if (!strcasecmp(mtype_of_result, "char")
+			 || !strcasecmp(mtype_of_result, "c"))
+			type_of_result = CHAR_RESULT;
+		else {
+			ast_log(LOG_WARNING, "Unknown type of result requested '%s'.\n",
+					mtype_of_result);
+			return -1;
 		}
 	}
-	
+
 	if (!mvalue1 || !mvalue2) {
-		ast_log(LOG_WARNING, "Supply all the parameters - just this once, please\n");
-		return NULL;
+		ast_log(LOG_WARNING,
+				"Supply all the parameters - just this once, please\n");
+		return -1;
 	}
 
 	if (sscanf(mvalue1, "%f", &fnum1) != 1) {
 		ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue1);
-		return NULL;
+		return -1;
 	}
 
 	if (sscanf(mvalue2, "%f", &fnum2) != 1) {
 		ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue2);
-		return NULL;
+		return -1;
 	}
 
 	switch (iaction) {
-	case ADDFUNCTION :
+	case ADDFUNCTION:
 		ftmp = fnum1 + fnum2;
 		break;
-	case DIVIDEFUNCTION :
+	case DIVIDEFUNCTION:
 		if (fnum2 <= 0)
-			ftmp = 0; /* can't do a divide by 0 */
+			ftmp = 0;			/* can't do a divide by 0 */
 		else
 			ftmp = (fnum1 / fnum2);
 		break;
-	case MULTIPLYFUNCTION :
+	case MULTIPLYFUNCTION:
 		ftmp = (fnum1 * fnum2);
 		break;
-	case SUBTRACTFUNCTION :
+	case SUBTRACTFUNCTION:
 		ftmp = (fnum1 - fnum2);
 		break;
-	case MODULUSFUNCTION :
-	{
-		int inum1 = fnum1;
-		int inum2 = fnum2;
-			
-		ftmp = (inum1 % inum2);
-		
+	case MODULUSFUNCTION:
+		{
+			int inum1 = fnum1;
+			int inum2 = fnum2;
+
+			ftmp = (inum1 % inum2);
+
+			break;
+		}
+	case GTFUNCTION:
+		ast_copy_string(buf, (fnum1 > fnum2) ? "TRUE" : "FALSE", len);
 		break;
-	}
-	case GTFUNCTION :
-		ast_copy_string (user_result, (fnum1 > fnum2)?"TRUE":"FALSE", sizeof (user_result));
+	case LTFUNCTION:
+		ast_copy_string(buf, (fnum1 < fnum2) ? "TRUE" : "FALSE", len);
 		break;
-	case LTFUNCTION :
-		ast_copy_string (user_result, (fnum1 < fnum2)?"TRUE":"FALSE", sizeof (user_result));
+	case GTEFUNCTION:
+		ast_copy_string(buf, (fnum1 >= fnum2) ? "TRUE" : "FALSE", len);
 		break;
-	case GTEFUNCTION :
-		ast_copy_string (user_result, (fnum1 >= fnum2)?"TRUE":"FALSE", sizeof (user_result));
+	case LTEFUNCTION:
+		ast_copy_string(buf, (fnum1 <= fnum2) ? "TRUE" : "FALSE", len);
 		break;
-	case LTEFUNCTION :
-		ast_copy_string (user_result, (fnum1 <= fnum2)?"TRUE":"FALSE", sizeof (user_result));
-		break;					
-	case EQFUNCTION :
-		ast_copy_string (user_result, (fnum1 == fnum2)?"TRUE":"FALSE", sizeof (user_result));
+	case EQFUNCTION:
+		ast_copy_string(buf, (fnum1 == fnum2) ? "TRUE" : "FALSE", len);
 		break;
-	default :
-		ast_log(LOG_WARNING, "Something happened that neither of us should be proud of %d\n", iaction);
-		return NULL;
+	default:
+		ast_log(LOG_WARNING,
+				"Something happened that neither of us should be proud of %d\n",
+				iaction);
+		return -1;
 	}
 
 	if (iaction < GTFUNCTION || iaction > EQFUNCTION) {
-	    if (type_of_result == FLOAT_RESULT)
-		    snprintf(user_result, sizeof(user_result), "%f", ftmp);
-	    else if (type_of_result == INT_RESULT)
-		    snprintf(user_result, sizeof(user_result), "%i", (int) ftmp);
-	    else if (type_of_result == HEX_RESULT)
-		snprintf(user_result, sizeof(user_result), "%x", (unsigned int) ftmp);
-	    else if (type_of_result == CHAR_RESULT)
-		snprintf(user_result, sizeof(user_result), "%c", (unsigned char) ftmp);
+		if (type_of_result == FLOAT_RESULT)
+			snprintf(buf, len, "%f", ftmp);
+		else if (type_of_result == INT_RESULT)
+			snprintf(buf, len, "%i", (int) ftmp);
+		else if (type_of_result == HEX_RESULT)
+			snprintf(buf, len, "%x", (unsigned int) ftmp);
+		else if (type_of_result == CHAR_RESULT)
+			snprintf(buf, len, "%c", (unsigned char) ftmp);
 	}
-		
-	ast_copy_string(buf, user_result, len);
-	
-	return buf;
+
+	return 0;
 }
 
 static struct ast_custom_function math_function = {
@@ -242,7 +236,7 @@ static struct ast_custom_function math_function = {
 	.synopsis = "Performs Mathematical Functions",
 	.syntax = "MATH(<number1><op><number 2>[,<type_of_result>])",
 	.desc = "Perform calculation on number 1 to number 2. Valid ops are: \n"
-    	    "    +,-,/,*,%,<,>,>=,<=,==\n"
+		"    +,-,/,*,%,<,>,>=,<=,==\n"
 		"and behave as their C equivalents.\n"
 		"<type_of_result> - wanted type of result:\n"
 		"	f, float - float(default)\n"
@@ -257,12 +251,12 @@ static char *tdesc = "Mathematical dialplan function";
 
 int unload_module(void)
 {
-        return ast_custom_function_unregister(&math_function);
+	return ast_custom_function_unregister(&math_function);
 }
 
 int load_module(void)
 {
-        return ast_custom_function_register(&math_function);
+	return ast_custom_function_register(&math_function);
 }
 
 char *description(void)