run indent on the whole tree and update copyright dates in prep for 1.0.5

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16579 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_expr/conio.h

@@ -20,25 +20,24 @@ extern "C" {
 
 #define BLINK 0
 
-typedef enum
-{
-    BLACK,
-    BLUE,
-    GREEN,
-    CYAN,
-    RED,
-    MAGENTA,
-    BROWN,
-    LIGHTGRAY,
-    DARKGRAY,
-    LIGHTBLUE,
-    LIGHTGREEN,
-    LIGHTCYAN,
-    LIGHTRED,
-    LIGHTMAGENTA,
-    YELLOW,
-    WHITE
-} COLORS;
+	typedef enum {
+		BLACK,
+		BLUE,
+		GREEN,
+		CYAN,
+		RED,
+		MAGENTA,
+		BROWN,
+		LIGHTGRAY,
+		DARKGRAY,
+		LIGHTBLUE,
+		LIGHTGREEN,
+		LIGHTCYAN,
+		LIGHTRED,
+		LIGHTMAGENTA,
+		YELLOW,
+		WHITE
+	} COLORS;
 
 
 #define cgets	_cgets
@@ -49,17 +48,16 @@ typedef enum
 
 /* blinkvideo */
 
-void clreol (void);
-void clrscr (void);
+	void clreol(void);
+	void clrscr(void);
 
-int _conio_gettext (int left, int top, int right, int bottom,
-                    char *str);
+	int _conio_gettext(int left, int top, int right, int bottom, char *str);
 /* _conio_kbhit */
 
-void delline (void);
+	void delline(void);
 
 /* gettextinfo */
-void gotoxy(int x, int y);
+	void gotoxy(int x, int y);
 /*
 highvideo
 insline
@@ -69,9 +67,9 @@ movetext
 normvideo
 */
 
-void gotoxy(int x, int y);
+	void gotoxy(int x, int y);
 
-void puttext (int left, int top, int right, int bottom, char *str);
+	void puttext(int left, int top, int right, int bottom, char *str);
 
 // Screen Variables
 
@@ -89,19 +87,19 @@ ScreenUpdateLine
 ScreenVisualBell
 _set_screen_lines */
 
-void _setcursortype (int type);
+	void _setcursortype(int type);
 
-void textattr (int _attr);
+	void textattr(int _attr);
 
-void textbackground (int color);
+	void textbackground(int color);
 
-void textcolor (int color);
+	void textcolor(int color);
 
 /* textmode */
 
-int wherex (void);
+	int wherex(void);
 
-int wherey (void);
+	int wherey(void);
 
 /* window */
 
@@ -135,27 +133,26 @@ int wherey (void);
  *
  */
 
-char*	_cgets (char*);
-int	_cprintf (const char*, ...);
-int	_cputs (const char*);
-int	_cscanf (char*, ...);
+	char *_cgets(char *);
+	int _cprintf(const char *, ...);
+	int _cputs(const char *);
+	int _cscanf(char *, ...);
 
-int	_getch (void);
-int	_getche (void);
-int	_kbhit (void);
-int	_putch (int);
-int	_ungetch (int);
+	int _getch(void);
+	int _getche(void);
+	int _kbhit(void);
+	int _putch(int);
+	int _ungetch(int);
 
 
-int	getch (void);
-int	getche (void);
-int	kbhit (void);
-int	putch (int);
-int	ungetch (int);
+	int getch(void);
+	int getche(void);
+	int kbhit(void);
+	int putch(int);
+	int ungetch(int);
 
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* _CONIO_H_ */
+#endif							/* _CONIO_H_ */

src/mod/applications/mod_expr/expreval.h

@@ -19,7 +19,7 @@ extern "C" {
 
 
 /* Define type of data to use */
-typedef double EXPRTYPE;
+	typedef double EXPRTYPE;
 
 /* Defines for various things */
 
@@ -27,101 +27,96 @@ typedef double EXPRTYPE;
 #define EXPR_MAXIDENTSIZE 255
 
 /* Error values */
-enum
-    {
-    EXPR_ERROR_UNKNOWN = -1, /* Unknown error */
-    EXPR_ERROR_NOERROR = 0, /* No Error */
-    EXPR_ERROR_MEMORY, /* Memory allocation failed */
-    EXPR_ERROR_NULLPOINTER, /* Null pointer passed to function */
-    EXPR_ERROR_NOTFOUND, /* Item not found in a list */
-    EXPR_ERROR_UNMATCHEDCOMMENT, /* Unmatched comment tags */
-    EXPR_ERROR_INVALIDCHAR, /* Invalid characters in expression */
-    EXPR_ERROR_ALREADYEXISTS, /* An item already called create */
-    EXPR_ERROR_ALREADYPARSEDBAD, /* Expression parsed already, but unsuccessfully. call free or clear */
-    EXPR_ERROR_ALREADYPARSEDGOOD, /* Expression parsed already, successfully, call free or clear */
-    EXPR_ERROR_EMPTYEXPR, /* Empty expression string passed to parse */
-    EXPR_ERROR_UNMATCHEDPAREN, /* Unmatched parenthesis */
-    EXPR_ERROR_SYNTAX, /* Syntax error in expression */
-    EXPR_ERROR_MISSINGSEMICOLON, /* Missing semicolon at end of expression */
-    EXPR_ERROR_BADIDENTIFIER, /* Identifier was to big or not formed right */
-    EXPR_ERROR_NOSUCHFUNCTION, /* Function does not exist in function list */
-    EXPR_ERROR_BADNUMBERARGUMENTS, /* Bad number of arguments in a function call */
-    EXPR_ERROR_BADEXPR, /* This is a bad expression to evaluate. It has not been parsed or has unsuccessfully */
-    EXPR_ERROR_UNABLETOASSIGN, /* Unable to do an assignment, maybe no variable list */
-    EXPR_ERROR_DIVBYZERO, /* Attempted a division by zero */
-    EXPR_ERROR_NOVARLIST, /* No variable list found but one is needed */
-    EXPR_ERROR_BREAK, /* Expression was broken by break function */
-    EXPR_ERROR_CONSTANTASSIGN, /* Assignment to a constant */
-    EXPR_ERROR_REFCONSTANT, /* Constant used as a reference parameter */
-    EXPR_ERROR_OUTOFRANGE, /* A bad value was passed to a function */
+	enum {
+		EXPR_ERROR_UNKNOWN = -1,	/* Unknown error */
+		EXPR_ERROR_NOERROR = 0,	/* No Error */
+		EXPR_ERROR_MEMORY,		/* Memory allocation failed */
+		EXPR_ERROR_NULLPOINTER,	/* Null pointer passed to function */
+		EXPR_ERROR_NOTFOUND,	/* Item not found in a list */
+		EXPR_ERROR_UNMATCHEDCOMMENT,	/* Unmatched comment tags */
+		EXPR_ERROR_INVALIDCHAR,	/* Invalid characters in expression */
+		EXPR_ERROR_ALREADYEXISTS,	/* An item already called create */
+		EXPR_ERROR_ALREADYPARSEDBAD,	/* Expression parsed already, but unsuccessfully. call free or clear */
+		EXPR_ERROR_ALREADYPARSEDGOOD,	/* Expression parsed already, successfully, call free or clear */
+		EXPR_ERROR_EMPTYEXPR,	/* Empty expression string passed to parse */
+		EXPR_ERROR_UNMATCHEDPAREN,	/* Unmatched parenthesis */
+		EXPR_ERROR_SYNTAX,		/* Syntax error in expression */
+		EXPR_ERROR_MISSINGSEMICOLON,	/* Missing semicolon at end of expression */
+		EXPR_ERROR_BADIDENTIFIER,	/* Identifier was to big or not formed right */
+		EXPR_ERROR_NOSUCHFUNCTION,	/* Function does not exist in function list */
+		EXPR_ERROR_BADNUMBERARGUMENTS,	/* Bad number of arguments in a function call */
+		EXPR_ERROR_BADEXPR,		/* This is a bad expression to evaluate. It has not been parsed or has unsuccessfully */
+		EXPR_ERROR_UNABLETOASSIGN,	/* Unable to do an assignment, maybe no variable list */
+		EXPR_ERROR_DIVBYZERO,	/* Attempted a division by zero */
+		EXPR_ERROR_NOVARLIST,	/* No variable list found but one is needed */
+		EXPR_ERROR_BREAK,		/* Expression was broken by break function */
+		EXPR_ERROR_CONSTANTASSIGN,	/* Assignment to a constant */
+		EXPR_ERROR_REFCONSTANT,	/* Constant used as a reference parameter */
+		EXPR_ERROR_OUTOFRANGE,	/* A bad value was passed to a function */
 
-    EXPR_ERROR_USER /* Custom errors should be larger than this */
-    };
+		EXPR_ERROR_USER			/* Custom errors should be larger than this */
+	};
 
 /* Macros */
 
 /* Forward declarations */
-typedef struct _exprNode exprNode;
-typedef struct _exprFuncList exprFuncList;
-typedef struct _exprValList exprValList;
-typedef struct _exprObj exprObj;
+	typedef struct _exprNode exprNode;
+	typedef struct _exprFuncList exprFuncList;
+	typedef struct _exprValList exprValList;
+	typedef struct _exprObj exprObj;
 
 /* Function types */
-typedef int (*exprFuncType)(exprObj *obj, exprNode *nodes, int nodecount, EXPRTYPE **refs, int refcount, EXPRTYPE *val);
-typedef int (*exprBreakFuncType)(exprObj *obj);
+	typedef int (*exprFuncType) (exprObj * obj, exprNode * nodes, int nodecount, EXPRTYPE ** refs, int refcount, EXPRTYPE * val);
+	typedef int (*exprBreakFuncType) (exprObj * obj);
 
 
 
 /* Functions */
 
 /* Version information function */
-void exprGetVersion(int *major, int *minor);
+	void exprGetVersion(int *major, int *minor);
 
 /* Functions for function lists */
-int exprFuncListCreate(exprFuncList **flist);
-int exprFuncListAdd(exprFuncList *flist, char *name, exprFuncType ptr, int min, int max, int refmin, int refmax);
-int exprFuncListFree(exprFuncList *flist);
-int exprFuncListClear(exprFuncList *flist);
-int exprFuncListInit(exprFuncList *flist);
+	int exprFuncListCreate(exprFuncList ** flist);
+	int exprFuncListAdd(exprFuncList * flist, char *name, exprFuncType ptr, int min, int max, int refmin, int refmax);
+	int exprFuncListFree(exprFuncList * flist);
+	int exprFuncListClear(exprFuncList * flist);
+	int exprFuncListInit(exprFuncList * flist);
 
 /* Functions for value lists */
-int exprValListCreate(exprValList **vlist);
-int exprValListAdd(exprValList *vlist, char *name, EXPRTYPE val);
-int exprValListSet(exprValList *vlist, char *name, EXPRTYPE val);
-int exprValListGet(exprValList *vlist, char *name, EXPRTYPE *val);
-int exprValListAddAddress(exprValList *vlist, char *name, EXPRTYPE *addr);
-int exprValListGetAddress(exprValList *vlist, char *name, EXPRTYPE **addr);
-void *exprValListGetNext(exprValList *vlist, char **name, EXPRTYPE *value, EXPRTYPE** addr, void *cookie);
-int exprValListFree(exprValList *vlist);
-int exprValListClear(exprValList *vlist);
-int exprValListInit(exprValList *vlist);
+	int exprValListCreate(exprValList ** vlist);
+	int exprValListAdd(exprValList * vlist, char *name, EXPRTYPE val);
+	int exprValListSet(exprValList * vlist, char *name, EXPRTYPE val);
+	int exprValListGet(exprValList * vlist, char *name, EXPRTYPE * val);
+	int exprValListAddAddress(exprValList * vlist, char *name, EXPRTYPE * addr);
+	int exprValListGetAddress(exprValList * vlist, char *name, EXPRTYPE ** addr);
+	void *exprValListGetNext(exprValList * vlist, char **name, EXPRTYPE * value, EXPRTYPE ** addr, void *cookie);
+	int exprValListFree(exprValList * vlist);
+	int exprValListClear(exprValList * vlist);
+	int exprValListInit(exprValList * vlist);
 
 /* Functions for expression objects */
-int exprCreate(exprObj **obj, exprFuncList *flist, exprValList *vlist, exprValList *clist,
-    exprBreakFuncType breaker, void *userdata);
-int exprFree(exprObj *obj);
-int exprClear(exprObj *obj);
-int exprParse(exprObj *obj, char *expr);
-int exprEval(exprObj *obj, EXPRTYPE *val);
-int exprEvalNode(exprObj *obj, exprNode *nodes, int curnode, EXPRTYPE *val);
-exprFuncList *exprGetFuncList(exprObj *obj);
-exprValList *exprGetVarList(exprObj *obj);
-exprValList *exprGetConstList(exprObj *obj);
-exprBreakFuncType exprGetBreakFunc(exprObj *obj);
-int exprGetBreakResult(exprObj *obj);
-void* exprGetUserData(exprObj *obj);
-void exprSetUserData(exprObj *obj, void *userdata);
-void exprSetBreakCount(exprObj *obj, int count);
-void exprGetErrorPosition(exprObj *obj, int *start, int *end);
+	int exprCreate(exprObj ** obj, exprFuncList * flist, exprValList * vlist, exprValList * clist, exprBreakFuncType breaker, void *userdata);
+	int exprFree(exprObj * obj);
+	int exprClear(exprObj * obj);
+	int exprParse(exprObj * obj, char *expr);
+	int exprEval(exprObj * obj, EXPRTYPE * val);
+	int exprEvalNode(exprObj * obj, exprNode * nodes, int curnode, EXPRTYPE * val);
+	exprFuncList *exprGetFuncList(exprObj * obj);
+	exprValList *exprGetVarList(exprObj * obj);
+	exprValList *exprGetConstList(exprObj * obj);
+	exprBreakFuncType exprGetBreakFunc(exprObj * obj);
+	int exprGetBreakResult(exprObj * obj);
+	void *exprGetUserData(exprObj * obj);
+	void exprSetUserData(exprObj * obj, void *userdata);
+	void exprSetBreakCount(exprObj * obj, int count);
+	void exprGetErrorPosition(exprObj * obj, int *start, int *end);
 
 /* Other useful routines */
-int exprValidIdent(char *name);
+	int exprValidIdent(char *name);
 
 /* Name mangling */
 #ifdef __cplusplus
 }
 #endif
-
-
-
-#endif /* __BAVII_EXPREVAL_H */
+#endif							/* __BAVII_EXPREVAL_H */

src/mod/applications/mod_expr/exprmem.h

@@ -13,7 +13,7 @@
 /* Needed for exprNode */
 #include "exprpriv.h"
 
-void* exprAllocMem(size_t size);
+void *exprAllocMem(size_t size);
 void exprFreeMem(void *data);
 exprNode *exprAllocNodes(size_t count);
 

src/mod/applications/mod_expr/exprpriv.h

@@ -30,196 +30,180 @@ extern "C" {
 #define EXPR_VERSIONMINOR 7
 
 /* Node types */
-enum
-    {
-    EXPR_NODETYPE_UNKNOWN = 0,
-    EXPR_NODETYPE_MULTI,
-    EXPR_NODETYPE_ADD,
-    EXPR_NODETYPE_SUBTRACT,
-    EXPR_NODETYPE_MULTIPLY,
-    EXPR_NODETYPE_DIVIDE,
-    EXPR_NODETYPE_EXPONENT,
-    EXPR_NODETYPE_NEGATE,
-    EXPR_NODETYPE_VALUE,
-    EXPR_NODETYPE_VARIABLE,
-    EXPR_NODETYPE_ASSIGN,
-    EXPR_NODETYPE_FUNCTION
-    };
+	enum {
+		EXPR_NODETYPE_UNKNOWN = 0,
+		EXPR_NODETYPE_MULTI,
+		EXPR_NODETYPE_ADD,
+		EXPR_NODETYPE_SUBTRACT,
+		EXPR_NODETYPE_MULTIPLY,
+		EXPR_NODETYPE_DIVIDE,
+		EXPR_NODETYPE_EXPONENT,
+		EXPR_NODETYPE_NEGATE,
+		EXPR_NODETYPE_VALUE,
+		EXPR_NODETYPE_VARIABLE,
+		EXPR_NODETYPE_ASSIGN,
+		EXPR_NODETYPE_FUNCTION
+	};
 
 /* Functions can be evaluated directly in EXPREVAL.  If fptr
    is NULL, type is used to determine what the function is */
-enum
-    {
-    EXPR_NODEFUNC_UNKNOWN = 0,
-    EXPR_NODEFUNC_ABS,
-    EXPR_NODEFUNC_MOD,
-    EXPR_NODEFUNC_IPART,
-    EXPR_NODEFUNC_FPART,
-    EXPR_NODEFUNC_MIN,
-    EXPR_NODEFUNC_MAX,
-    EXPR_NODEFUNC_POW,
-    EXPR_NODEFUNC_SQRT,
-    EXPR_NODEFUNC_SIN,
-    EXPR_NODEFUNC_SINH,
-    EXPR_NODEFUNC_ASIN,
-    EXPR_NODEFUNC_COS,
-    EXPR_NODEFUNC_COSH,
-    EXPR_NODEFUNC_ACOS,
-    EXPR_NODEFUNC_TAN,
-    EXPR_NODEFUNC_TANH,
-    EXPR_NODEFUNC_ATAN,
-    EXPR_NODEFUNC_ATAN2,
-    EXPR_NODEFUNC_LOG,
-    EXPR_NODEFUNC_POW10,
-    EXPR_NODEFUNC_LN,
-    EXPR_NODEFUNC_EXP,
-    EXPR_NODEFUNC_LOGN,
-    EXPR_NODEFUNC_CEIL,
-    EXPR_NODEFUNC_FLOOR,
-    EXPR_NODEFUNC_RAND,
-    EXPR_NODEFUNC_RANDOM,
-    EXPR_NODEFUNC_RANDOMIZE,
-    EXPR_NODEFUNC_DEG,
-    EXPR_NODEFUNC_RAD,
-    EXPR_NODEFUNC_RECTTOPOLR,
-    EXPR_NODEFUNC_RECTTOPOLA,
-    EXPR_NODEFUNC_POLTORECTX,
-    EXPR_NODEFUNC_POLTORECTY,
-    EXPR_NODEFUNC_IF,
-    EXPR_NODEFUNC_SELECT,
-    EXPR_NODEFUNC_EQUAL,
-    EXPR_NODEFUNC_ABOVE,
-    EXPR_NODEFUNC_BELOW,
-    EXPR_NODEFUNC_AVG,
-    EXPR_NODEFUNC_CLIP,
-    EXPR_NODEFUNC_CLAMP,
-    EXPR_NODEFUNC_PNTCHANGE,
-    EXPR_NODEFUNC_POLY,
-    EXPR_NODEFUNC_AND,
-    EXPR_NODEFUNC_OR,
-    EXPR_NODEFUNC_NOT,
-    EXPR_NODEFUNC_FOR,
-    EXPR_NODEFUNC_MANY
-    };
+	enum {
+		EXPR_NODEFUNC_UNKNOWN = 0,
+		EXPR_NODEFUNC_ABS,
+		EXPR_NODEFUNC_MOD,
+		EXPR_NODEFUNC_IPART,
+		EXPR_NODEFUNC_FPART,
+		EXPR_NODEFUNC_MIN,
+		EXPR_NODEFUNC_MAX,
+		EXPR_NODEFUNC_POW,
+		EXPR_NODEFUNC_SQRT,
+		EXPR_NODEFUNC_SIN,
+		EXPR_NODEFUNC_SINH,
+		EXPR_NODEFUNC_ASIN,
+		EXPR_NODEFUNC_COS,
+		EXPR_NODEFUNC_COSH,
+		EXPR_NODEFUNC_ACOS,
+		EXPR_NODEFUNC_TAN,
+		EXPR_NODEFUNC_TANH,
+		EXPR_NODEFUNC_ATAN,
+		EXPR_NODEFUNC_ATAN2,
+		EXPR_NODEFUNC_LOG,
+		EXPR_NODEFUNC_POW10,
+		EXPR_NODEFUNC_LN,
+		EXPR_NODEFUNC_EXP,
+		EXPR_NODEFUNC_LOGN,
+		EXPR_NODEFUNC_CEIL,
+		EXPR_NODEFUNC_FLOOR,
+		EXPR_NODEFUNC_RAND,
+		EXPR_NODEFUNC_RANDOM,
+		EXPR_NODEFUNC_RANDOMIZE,
+		EXPR_NODEFUNC_DEG,
+		EXPR_NODEFUNC_RAD,
+		EXPR_NODEFUNC_RECTTOPOLR,
+		EXPR_NODEFUNC_RECTTOPOLA,
+		EXPR_NODEFUNC_POLTORECTX,
+		EXPR_NODEFUNC_POLTORECTY,
+		EXPR_NODEFUNC_IF,
+		EXPR_NODEFUNC_SELECT,
+		EXPR_NODEFUNC_EQUAL,
+		EXPR_NODEFUNC_ABOVE,
+		EXPR_NODEFUNC_BELOW,
+		EXPR_NODEFUNC_AVG,
+		EXPR_NODEFUNC_CLIP,
+		EXPR_NODEFUNC_CLAMP,
+		EXPR_NODEFUNC_PNTCHANGE,
+		EXPR_NODEFUNC_POLY,
+		EXPR_NODEFUNC_AND,
+		EXPR_NODEFUNC_OR,
+		EXPR_NODEFUNC_NOT,
+		EXPR_NODEFUNC_FOR,
+		EXPR_NODEFUNC_MANY
+	};
 
 /* Forward declarations */
-typedef struct _exprFunc exprFunc;
-typedef struct _exprVal exprVal;
+	typedef struct _exprFunc exprFunc;
+	typedef struct _exprVal exprVal;
 
 /* Expression object */
-struct _exprObj
-    {
-    struct _exprFuncList *flist; /* Functions */
-    struct _exprValList *vlist; /* Variables */
-    struct _exprValList *clist; /* Constants */
-    struct _exprNode *headnode; /* Head parsed node */
+	struct _exprObj {
+		struct _exprFuncList *flist;	/* Functions */
+		struct _exprValList *vlist;	/* Variables */
+		struct _exprValList *clist;	/* Constants */
+		struct _exprNode *headnode;	/* Head parsed node */
 
-    exprBreakFuncType breakerfunc; /* Break function type */
+		exprBreakFuncType breakerfunc;	/* Break function type */
 
-    void *userdata; /* User data, can be any 32 bit value */
-    int parsedgood; /* non-zero if successfully parsed */
-    int parsedbad; /* non-zero if parsed but unsuccessful */
-    int breakcount; /* how often to check the breaker function */
-    int breakcur; /* do we check the breaker function yet */
-    int starterr; /* start position of an error */
-    int enderr; /* end position of an error */
-    };
+		void *userdata;			/* User data, can be any 32 bit value */
+		int parsedgood;			/* non-zero if successfully parsed */
+		int parsedbad;			/* non-zero if parsed but unsuccessful */
+		int breakcount;			/* how often to check the breaker function */
+		int breakcur;			/* do we check the breaker function yet */
+		int starterr;			/* start position of an error */
+		int enderr;				/* end position of an error */
+	};
 
 /* Object for a function */
-struct _exprFunc
-    {
-    char *fname; /* Name of the function */
-    exprFuncType fptr; /* Function pointer */
-    int min, max; /* Min and max args for the function. */
-    int refmin, refmax; /* Min and max ref. variables for the function */
-    int type; /* Function node type.  exprEvalNOde solves the function */
+	struct _exprFunc {
+		char *fname;			/* Name of the function */
+		exprFuncType fptr;		/* Function pointer */
+		int min, max;			/* Min and max args for the function. */
+		int refmin, refmax;		/* Min and max ref. variables for the function */
+		int type;				/* Function node type.  exprEvalNOde solves the function */
 
-    struct _exprFunc *next; /* For linked list */
-    };
+		struct _exprFunc *next;	/* For linked list */
+	};
 
 /* Function list object */
-struct _exprFuncList
-    {
-    struct _exprFunc *head;
-    };
+	struct _exprFuncList {
+		struct _exprFunc *head;
+	};
 
 /* Object for values */
-struct _exprVal
-    {
-    char *vname; /* Name of the value */
-    EXPRTYPE vval; /* Value of the value */
-    EXPRTYPE *vptr; /* Pointer to a value.  Used only if not NULL */
+	struct _exprVal {
+		char *vname;			/* Name of the value */
+		EXPRTYPE vval;			/* Value of the value */
+		EXPRTYPE *vptr;			/* Pointer to a value.  Used only if not NULL */
 
-    struct _exprVal *next; /* For linked list */
-    };
+		struct _exprVal *next;	/* For linked list */
+	};
 
 /* Value list */
-struct _exprValList
-    {
-    struct _exprVal *head;
-    };
+	struct _exprValList {
+		struct _exprVal *head;
+	};
 
 /* Expression node type */
-struct _exprNode
-    {
-    int type; /* Node type */
+	struct _exprNode {
+		int type;				/* Node type */
 
-    union _data /* Union of info for various types */
-        {
-        struct _oper
-            {
-            struct _exprNode *nodes; /* Operation arguments */
-            int nodecount; /* Number of arguments */
-            } oper;
+		union _data {			/* Union of info for various types */
+			struct _oper {
+				struct _exprNode *nodes;	/* Operation arguments */
+				int nodecount;	/* Number of arguments */
+			} oper;
 
-        struct _variable
-            {
-            EXPRTYPE *vaddr; /* Used if EXPR_FAST_VAR_ACCESS defined */
-            } variable;
+			struct _variable {
+				EXPRTYPE *vaddr;	/* Used if EXPR_FAST_VAR_ACCESS defined */
+			} variable;
 
-        struct _value
-            {
-            EXPRTYPE value; /* Value if type is value */
-            } value;
+			struct _value {
+				EXPRTYPE value;	/* Value if type is value */
+			} value;
 
-        struct _assign /* Assignment struct */
-            {
-            EXPRTYPE *vaddr; /* Used if EXPR_FAST_VAR_ACCESS defined */
-            struct _exprNode *node; /* Node to evaluate */
-            } assign;
+			struct _assign {	/* Assignment struct */
+				EXPRTYPE *vaddr;	/* Used if EXPR_FAST_VAR_ACCESS defined */
+				struct _exprNode *node;	/* Node to evaluate */
+			} assign;
 
-        struct _function
-            {
-            exprFuncType fptr; /* Function pointer */
-            struct _exprNode *nodes; /* Array of argument nodes */
-            int nodecount; /* Number of argument nodes */
-            EXPRTYPE **refs; /* Reference variables */
-            int refcount; /* Number of variable references (not a reference counter) */
-            int type; /* Type of function for exprEvalNode if fptr is NULL */
-            } function;
-        } data;
-    };
+			struct _function {
+				exprFuncType fptr;	/* Function pointer */
+				struct _exprNode *nodes;	/* Array of argument nodes */
+				int nodecount;	/* Number of argument nodes */
+				EXPRTYPE **refs;	/* Reference variables */
+				int refcount;	/* Number of variable references (not a reference counter) */
+				int type;		/* Type of function for exprEvalNode if fptr is NULL */
+			} function;
+		} data;
+	};
 
 
 
 /* Functions for function lists */
-int exprFuncListAddType(exprFuncList *flist, char *name, int type, int min, int max, int refmin, int refmax);
-int exprFuncListGet(exprFuncList *flist, char *name, exprFuncType *ptr, int *type, int *min, int *max, int *refmin, int *refmax);
+	int exprFuncListAddType(exprFuncList * flist, char *name, int type, int min, int max, int refmin, int refmax);
+	int exprFuncListGet(exprFuncList * flist, char *name, exprFuncType * ptr, int *type, int *min, int *max, int *refmin, int *refmax);
 
 #ifdef WIN32
 #define SWITCH_DECLARE(type)			__declspec(dllimport) type __stdcall
 #else
-#define SWITCH_DECLARE(type) type 
+#define SWITCH_DECLARE(type) type
 #endif
 
-SWITCH_DECLARE(int) switch_isalnum(int c);
-SWITCH_DECLARE(int) switch_isalpha(int c);
-SWITCH_DECLARE(int) switch_isdigit(int c);
-SWITCH_DECLARE(int) switch_isspace(int c);
+	    SWITCH_DECLARE(int) switch_isalnum(int c);
+	    SWITCH_DECLARE(int) switch_isalpha(int c);
+	    SWITCH_DECLARE(int) switch_isdigit(int c);
+	    SWITCH_DECLARE(int) switch_isspace(int c);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __BAVII_EXPRPRIV_H */
-
+#endif							/* __BAVII_EXPRPRIV_H */

src/mod/applications/mod_expr/mod_expr.c

@@ -1,6 +1,6 @@
 /* 
  * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ * Copyright (C) 2005-2010, Anthony Minessale II <anthm@freeswitch.org>
  *
  * Version: MPL 1.1
  *