git:master: core: removed append_branch() from cfg language structure - sr-dev

30 Aug 2012

Module: sip-router
Branch: master
Commit: 41918bca6d6a99f6773a72ab132e75c940ecd79a
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41918bca...
Author: Daniel-Constantin Mierla miconda@gmail.com
Committer: Daniel-Constantin Mierla miconda@gmail.com
Date:   Thu Aug 30 22:36:10 2012 +0200
core: removed append_branch() from cfg language structure
- cfg append_branch() is no longer implemented by core, being moved to
  corex module in order to allow variables in the parameters
---
cfg.lex |    3 ---
 cfg.y   |   23 -----------------------
 2 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/cfg.lex b/cfg.lex
index 76eb2f1..f986354 100644
--- a/cfg.lex
+++ b/cfg.lex
@@ -236,7 +236,6 @@ PREFIX			"prefix"
 STRIP			"strip"
 STRIP_TAIL		"strip_tail"
 SET_USERPHONE		"userphone"
-APPEND_BRANCH	"append_branch"
 REMOVE_BRANCH	"remove_branch"
 CLEAR_BRANCHES	"clear_branches"
 IF				"if"
@@ -641,8 +640,6 @@ IMPORTFILE      "import_file"
 <INITIAL>{PREFIX}	{ count(); yylval.strval=yytext; return PREFIX; }
 <INITIAL>{STRIP}	{ count(); yylval.strval=yytext; return STRIP; }
 <INITIAL>{STRIP_TAIL}	{ count(); yylval.strval=yytext; return STRIP_TAIL; }
-<INITIAL>{APPEND_BRANCH}	{ count(); yylval.strval=yytext;
-								return APPEND_BRANCH; }
 <INITIAL>{REMOVE_BRANCH}	{ count(); yylval.strval=yytext;
    							return REMOVE_BRANCH; }
 <INITIAL>{CLEAR_BRANCHES}	{ count(); yylval.strval=yytext;
diff --git a/cfg.y b/cfg.y
index e094223..0ae0e40 100644
--- a/cfg.y
+++ b/cfg.y
@@ -3289,29 +3289,6 @@ cmd:
    | STRIP LPAREN error RPAREN { $$=0; yyerror("bad argument, number expected"); }
    | SET_USERPHONE LPAREN RPAREN { $$=mk_action(SET_USERPHONE_T, 0); set_cfg_pos($$); }
    | SET_USERPHONE error { $$=0; yyerror("missing '(' or ')' ?"); }
-	| APPEND_BRANCH LPAREN STRING COMMA STRING RPAREN {
-		qvalue_t q;
-		if (str2q(&q, $5, strlen($5)) < 0) {
-			yyerror("bad argument, q value expected");
-		}
-		$$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, $3, NUMBER_ST, (void *)(long)q);
-		set_cfg_pos($$);
-	}
-	| APPEND_BRANCH LPAREN STRING RPAREN {
-		$$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, $3,
-							NUMBER_ST, (void *)Q_UNSPECIFIED);
-		set_cfg_pos($$);
-	}
-	| APPEND_BRANCH LPAREN RPAREN {
-		$$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, 0,
-							NUMBER_ST, (void *)Q_UNSPECIFIED);
-		set_cfg_pos($$);
-	}
-	| APPEND_BRANCH {
-		$$=mk_action(APPEND_BRANCH_T, 2, STRING_ST, 0,
-							NUMBER_ST, (void *)Q_UNSPECIFIED);
-		set_cfg_pos($$);
-	}
    | REMOVE_BRANCH LPAREN intno RPAREN {
    		$$=mk_action(REMOVE_BRANCH_T, 1, NUMBER_ST, (void*)$3);
    		set_cfg_pos($$);

    