diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 0530fdede3b..5e00fa2073d 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1424,7 +1424,7 @@ void lua_sr_core_openlibs(lua_State *L) /** * */ -int sr_kemi_return(lua_State* L, sr_kemi_t *ket, int rc) +int sr_kemi_lua_return_int(lua_State* L, sr_kemi_t *ket, int rc) { if(ket->rtype==SR_KEMIP_INT) { lua_pushinteger(L, rc); @@ -1469,7 +1469,7 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) argc = lua_gettop(L); if(argc==pdelta && ket->ptypes[0]==SR_KEMIP_NONE) { ret = ((sr_kemi_fm_f)(ket->func))(env_L->msg); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } if(argc==pdelta && ket->ptypes[0]!=SR_KEMIP_NONE) { LM_ERR("invalid number of parameters for: %.*s\n", @@ -1506,10 +1506,10 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) case 1: if(ket->ptypes[0]==SR_KEMIP_INT) { ret = ((sr_kemi_fmn_f)(ket->func))(env_L->msg, vps[0].n); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR) { ret = ((sr_kemi_fms_f)(ket->func))(env_L->msg, &vps[0].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1520,10 +1520,10 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) if(ket->ptypes[0]==SR_KEMIP_INT) { if(ket->ptypes[1]==SR_KEMIP_INT) { ret = ((sr_kemi_fmnn_f)(ket->func))(env_L->msg, vps[0].n, vps[1].n); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[1]==SR_KEMIP_STR) { ret = ((sr_kemi_fmns_f)(ket->func))(env_L->msg, vps[0].n, &vps[1].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1532,10 +1532,10 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) } else if(ket->ptypes[0]==SR_KEMIP_STR) { if(ket->ptypes[1]==SR_KEMIP_INT) { ret = ((sr_kemi_fmsn_f)(ket->func))(env_L->msg, &vps[0].s, vps[1].n); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[1]==SR_KEMIP_STR) { ret = ((sr_kemi_fmss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1553,11 +1553,11 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) if(ket->ptypes[2]==SR_KEMIP_INT) { ret = ((sr_kemi_fmnnn_f)(ket->func))(env_L->msg, vps[0].n, vps[1].n, vps[2].n); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[2]==SR_KEMIP_STR) { ret = ((sr_kemi_fmnns_f)(ket->func))(env_L->msg, vps[0].n, vps[1].n, &vps[2].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1567,11 +1567,11 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) if(ket->ptypes[2]==SR_KEMIP_INT) { ret = ((sr_kemi_fmnsn_f)(ket->func))(env_L->msg, vps[0].n, &vps[1].s, vps[2].n); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[2]==SR_KEMIP_STR) { ret = ((sr_kemi_fmnss_f)(ket->func))(env_L->msg, vps[0].n, &vps[1].s, &vps[2].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1587,11 +1587,11 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) if(ket->ptypes[2]==SR_KEMIP_INT) { ret = ((sr_kemi_fmsnn_f)(ket->func))(env_L->msg, &vps[0].s, vps[1].n, vps[2].n); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[2]==SR_KEMIP_STR) { ret = ((sr_kemi_fmsns_f)(ket->func))(env_L->msg, &vps[0].s, vps[1].n, &vps[2].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1601,11 +1601,11 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) if(ket->ptypes[2]==SR_KEMIP_INT) { ret = ((sr_kemi_fmssn_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, vps[2].n); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[2]==SR_KEMIP_STR) { ret = ((sr_kemi_fmsss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, &vps[2].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1629,14 +1629,14 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) || ket->ptypes[3]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR || ket->ptypes[1]==SR_KEMIP_STR || ket->ptypes[2]==SR_KEMIP_INT || ket->ptypes[3]==SR_KEMIP_INT) { ret = ((sr_kemi_fmssnn_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1652,7 +1652,7 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) ret = ((sr_kemi_fmsssss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1669,7 +1669,7 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) ret = ((sr_kemi_fmssssss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s, &vps[5].s); - return sr_kemi_return(L, ket, ret); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s);