浏览代码

app_lua: cleanup of indentation

Daniel-Constantin Mierla 9 年之前
父节点
当前提交
36812509a3

+ 2 - 2
modules/app_lua/app_lua_api.c

@@ -1,5 +1,5 @@
 /**
 /**
- * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com)
+ * Copyright (C) 2010-2016 Daniel-Constantin Mierla (asipto.com)
  *
  *
  * This file is part of Kamailio, a free SIP server.
  * This file is part of Kamailio, a free SIP server.
  *
  *
@@ -77,7 +77,7 @@ static sr_lua_script_ver_t *sr_lua_script_ver = NULL;
 int lua_sr_alloc_script_ver(void)
 int lua_sr_alloc_script_ver(void)
 {
 {
 	int size = _sr_L_env.nload;
 	int size = _sr_L_env.nload;
-	
+
 	sr_lua_script_ver = (sr_lua_script_ver_t *) shm_malloc(sizeof(sr_lua_script_ver_t));
 	sr_lua_script_ver = (sr_lua_script_ver_t *) shm_malloc(sizeof(sr_lua_script_ver_t));
 	if(sr_lua_script_ver==NULL)
 	if(sr_lua_script_ver==NULL)
 	{
 	{

+ 1 - 1
modules/app_lua/app_lua_api.h

@@ -1,5 +1,5 @@
 /**
 /**
- * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com)
+ * Copyright (C) 2010-2016 Daniel-Constantin Mierla (asipto.com)
  *
  *
  * This file is part of Kamailio, a free SIP server.
  * This file is part of Kamailio, a free SIP server.
  *
  *

+ 24 - 24
modules/app_lua/app_lua_exp.c

@@ -1,5 +1,5 @@
 /**
 /**
- * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com)
+ * Copyright (C) 2010-2016 Daniel-Constantin Mierla (asipto.com)
  *
  *
  * This file is part of Kamailio, a free SIP server.
  * This file is part of Kamailio, a free SIP server.
  *
  *
@@ -180,7 +180,7 @@ static rls_api_t _lua_rlsb;
 static alias_db_api_t _lua_alias_dbb;
 static alias_db_api_t _lua_alias_dbb;
 
 
 /**
 /**
- * msilo 
+ * msilo
  */
  */
 static msilo_api_t _lua_msilob;
 static msilo_api_t _lua_msilob;
 
 
@@ -242,7 +242,7 @@ static int lua_sr_sl_send_reply (lua_State *L)
 
 
 	if(code<100 || code>=800)
 	if(code<100 || code>=800)
 		return app_lua_return_error(L);
 		return app_lua_return_error(L);
-	
+
 	txt.s = (char*)lua_tostring(L, -1);
 	txt.s = (char*)lua_tostring(L, -1);
 	if(txt.s==NULL || env_L->msg==NULL)
 	if(txt.s==NULL || env_L->msg==NULL)
 		return app_lua_return_error(L);
 		return app_lua_return_error(L);
@@ -2292,7 +2292,7 @@ static int lua_sr_pres_auth_status(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE))
 	{
 	{
 		LM_WARN("weird: presence function executed but module not registered\n");
 		LM_WARN("weird: presence function executed but module not registered\n");
@@ -2315,7 +2315,7 @@ static int lua_sr_pres_auth_status(lua_State *L)
 	param[0].len = strlen(param[0].s);
 	param[0].len = strlen(param[0].s);
 	param[1].s = (char *) lua_tostring(L, -1);
 	param[1].s = (char *) lua_tostring(L, -1);
 	param[1].len = strlen(param[1].s);
 	param[1].len = strlen(param[1].s);
-	
+
 	ret = _lua_presenceb.pres_auth_status(env_L->msg, param[0], param[1]);
 	ret = _lua_presenceb.pres_auth_status(env_L->msg, param[0], param[1]);
 	return app_lua_return_int(L, ret);
 	return app_lua_return_int(L, ret);
 }
 }
@@ -2329,7 +2329,7 @@ static int lua_sr_pres_handle_publish(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE))
 	{
 	{
 		LM_WARN("weird: presence function executed but module not registered\n");
 		LM_WARN("weird: presence function executed but module not registered\n");
@@ -2361,7 +2361,7 @@ static int lua_sr_pres_handle_subscribe(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE))
 	{
 	{
 		LM_WARN("weird: presence function executed but module not registered\n");
 		LM_WARN("weird: presence function executed but module not registered\n");
@@ -2419,7 +2419,7 @@ static int lua_sr_pres_check_basic(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE_XML))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE_XML))
 	{
 	{
 		LM_WARN("weird: presence_xml function executed but module not registered\n");
 		LM_WARN("weird: presence_xml function executed but module not registered\n");
@@ -2442,7 +2442,7 @@ static int lua_sr_pres_check_basic(lua_State *L)
 	param[0].len = strlen(param[0].s);
 	param[0].len = strlen(param[0].s);
 	param[1].s = (char *) lua_tostring(L, -1);
 	param[1].s = (char *) lua_tostring(L, -1);
 	param[1].len = strlen(param[1].s);
 	param[1].len = strlen(param[1].s);
-	
+
 	ret = _lua_presence_xmlb.pres_check_basic(env_L->msg, param[0], param[1]);
 	ret = _lua_presence_xmlb.pres_check_basic(env_L->msg, param[0], param[1]);
 	return app_lua_return_int(L, ret);
 	return app_lua_return_int(L, ret);
 }
 }
@@ -2457,7 +2457,7 @@ static int lua_sr_pres_check_activities(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE_XML))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE_XML))
 	{
 	{
 		LM_WARN("weird: presence_xml function executed but module not registered\n");
 		LM_WARN("weird: presence_xml function executed but module not registered\n");
@@ -2480,7 +2480,7 @@ static int lua_sr_pres_check_activities(lua_State *L)
 	param[0].len = strlen(param[0].s);
 	param[0].len = strlen(param[0].s);
 	param[1].s = (char *) lua_tostring(L, -1);
 	param[1].s = (char *) lua_tostring(L, -1);
 	param[1].len = strlen(param[1].s);
 	param[1].len = strlen(param[1].s);
-	
+
 	ret = _lua_presence_xmlb.pres_check_activities(env_L->msg, param[0], param[1]);
 	ret = _lua_presence_xmlb.pres_check_activities(env_L->msg, param[0], param[1]);
 	return app_lua_return_int(L, ret);
 	return app_lua_return_int(L, ret);
 }
 }
@@ -2504,7 +2504,7 @@ static int lua_sr_textops_is_privacy(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TEXTOPS))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TEXTOPS))
 	{
 	{
 		LM_WARN("weird: textops function executed but module not registered\n");
 		LM_WARN("weird: textops function executed but module not registered\n");
@@ -2525,7 +2525,7 @@ static int lua_sr_textops_is_privacy(lua_State *L)
 
 
 	param[0].s = (char *) lua_tostring(L, -1);
 	param[0].s = (char *) lua_tostring(L, -1);
 	param[0].len = strlen(param[0].s);
 	param[0].len = strlen(param[0].s);
-	
+
 	ret = _lua_textopsb.is_privacy(env_L->msg, &param[0]);
 	ret = _lua_textopsb.is_privacy(env_L->msg, &param[0]);
 	return app_lua_return_int(L, ret);
 	return app_lua_return_int(L, ret);
 }
 }
@@ -2547,7 +2547,7 @@ static int lua_sr_pua_usrloc_set_publish(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PUA_USRLOC))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PUA_USRLOC))
 	{
 	{
 		LM_WARN("weird: pua_usrloc function executed but module not registered\n");
 		LM_WARN("weird: pua_usrloc function executed but module not registered\n");
@@ -2587,7 +2587,7 @@ static int lua_sr_siputils_has_totag(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SIPUTILS))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SIPUTILS))
 	{
 	{
 		LM_WARN("weird: siputils function executed but module not registered\n");
 		LM_WARN("weird: siputils function executed but module not registered\n");
@@ -2620,7 +2620,7 @@ static int lua_sr_siputils_is_uri_user_e164(lua_State *L)
 	str param[1];
 	str param[1];
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SIPUTILS))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SIPUTILS))
 	{
 	{
 		LM_WARN("weird: siputils function executed but module not registered\n");
 		LM_WARN("weird: siputils function executed but module not registered\n");
@@ -2641,7 +2641,7 @@ static int lua_sr_siputils_is_uri_user_e164(lua_State *L)
 
 
 	param[0].s = (char *) lua_tostring(L, -1);
 	param[0].s = (char *) lua_tostring(L, -1);
 	param[0].len = strlen(param[0].s);
 	param[0].len = strlen(param[0].s);
-	
+
 	ret = _lua_siputilsb.is_uri_user_e164(&param[0]);
 	ret = _lua_siputilsb.is_uri_user_e164(&param[0]);
 	if (ret < 0)
 	if (ret < 0)
 		return app_lua_return_false(L);
 		return app_lua_return_false(L);
@@ -2667,7 +2667,7 @@ static int lua_sr_rls_handle_subscribe(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_RLS))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_RLS))
 	{
 	{
 		LM_WARN("weird: rls function executed but module not registered\n");
 		LM_WARN("weird: rls function executed but module not registered\n");
@@ -2714,7 +2714,7 @@ static int lua_sr_rls_handle_notify(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_RLS))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_RLS))
 	{
 	{
 		LM_WARN("weird: rls function executed but module not registered\n");
 		LM_WARN("weird: rls function executed but module not registered\n");
@@ -2756,7 +2756,7 @@ static int lua_sr_alias_db_lookup(lua_State *L)
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 
 
 	env_L = sr_lua_env_get();
 	env_L = sr_lua_env_get();
-	
+
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_ALIAS_DB))
 	if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_ALIAS_DB))
 	{
 	{
 		LM_WARN("weird: alias_db function executed but module not registered\n");
 		LM_WARN("weird: alias_db function executed but module not registered\n");
@@ -2777,7 +2777,7 @@ static int lua_sr_alias_db_lookup(lua_State *L)
 
 
 	param[0].s = (char *) lua_tostring(L, -1);
 	param[0].s = (char *) lua_tostring(L, -1);
 	param[0].len = strlen(param[0].s);
 	param[0].len = strlen(param[0].s);
-	
+
 	ret = _lua_alias_dbb.alias_db_lookup(env_L->msg, param[0]);
 	ret = _lua_alias_dbb.alias_db_lookup(env_L->msg, param[0]);
 	return app_lua_return_int(L, ret);
 	return app_lua_return_int(L, ret);
 }
 }
@@ -2920,7 +2920,7 @@ static int lua_sr_uac_replace_x(lua_State *L, int htype)
 		param[0].len = 0;
 		param[0].len = 0;
 		param[1].s = (char *) lua_tostring(L, -1);
 		param[1].s = (char *) lua_tostring(L, -1);
 		param[1].len = strlen(param[1].s);
 		param[1].len = strlen(param[1].s);
-	
+
 	}
 	}
 	else if (lua_gettop(L) == 2)
 	else if (lua_gettop(L) == 2)
 	{
 	{
@@ -3148,14 +3148,14 @@ static int lua_sr_mq_add(lua_State *L)
 		LM_WARN("invalid number of parameters from Lua\n");
 		LM_WARN("invalid number of parameters from Lua\n");
 		return app_lua_return_error(L);
 		return app_lua_return_error(L);
 	}
 	}
-	
+
 	param[0].s = (char *) lua_tostring(L, -3);
 	param[0].s = (char *) lua_tostring(L, -3);
 	param[0].len = strlen(param[0].s);
 	param[0].len = strlen(param[0].s);
 	param[1].s = (char *) lua_tostring(L, -2);
 	param[1].s = (char *) lua_tostring(L, -2);
 	param[1].len = strlen(param[1].s);
 	param[1].len = strlen(param[1].s);
 	param[2].s = (char *) lua_tostring(L, -1);
 	param[2].s = (char *) lua_tostring(L, -1);
 	param[2].len = strlen(param[2].s);
 	param[2].len = strlen(param[2].s);
-	
+
 	ret = _lua_mqb.add(&param[0], &param[1], &param[2]);
 	ret = _lua_mqb.add(&param[0], &param[1], &param[2]);
 	return app_lua_return_int(L, ret);
 	return app_lua_return_int(L, ret);
 }
 }

+ 1 - 1
modules/app_lua/app_lua_exp.h

@@ -1,5 +1,5 @@
 /**
 /**
- * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com)
+ * Copyright (C) 2010-2016 Daniel-Constantin Mierla (asipto.com)
  *
  *
  * This file is part of Kamailio, a free SIP server.
  * This file is part of Kamailio, a free SIP server.
  *
  *

+ 2 - 2
modules/app_lua/app_lua_mod.c

@@ -1,5 +1,5 @@
 /**
 /**
- * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com)
+ * Copyright (C) 2010-2016 Daniel-Constantin Mierla (asipto.com)
  *
  *
  * This file is part of Kamailio, a free SIP server.
  * This file is part of Kamailio, a free SIP server.
  *
  *
@@ -117,7 +117,7 @@ static int mod_init(void)
 	if(lua_sr_init_mod()<0)
 	if(lua_sr_init_mod()<0)
 		return -1;
 		return -1;
 
 
-	if(app_lua_init_rpc()<0)  
+	if(app_lua_init_rpc()<0)
 	{
 	{
 		LM_ERR("failed to register RPC commands\n");
 		LM_ERR("failed to register RPC commands\n");
 		return -1;
 		return -1;

+ 9 - 9
modules/app_lua/app_lua_sr.c

@@ -1,5 +1,5 @@
 /**
 /**
- * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com)
+ * Copyright (C) 2010-2016 Daniel-Constantin Mierla (asipto.com)
  *
  *
  * This file is part of Kamailio, a free SIP server.
  * This file is part of Kamailio, a free SIP server.
  *
  *
@@ -878,7 +878,7 @@ static int lua_sr_pv_get (lua_State *L)
 {
 {
 	str pvn;
 	str pvn;
 	pv_spec_t *pvs;
 	pv_spec_t *pvs;
-    pv_value_t val;
+	pv_value_t val;
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 	int pl;
 	int pl;
 
 
@@ -928,7 +928,7 @@ static int lua_sr_pv_seti (lua_State *L)
 {
 {
 	str pvn;
 	str pvn;
 	pv_spec_t *pvs;
 	pv_spec_t *pvs;
-    pv_value_t val;
+	pv_value_t val;
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 	int pl;
 	int pl;
 
 
@@ -947,7 +947,7 @@ static int lua_sr_pv_seti (lua_State *L)
 	memset(&val, 0, sizeof(pv_value_t));
 	memset(&val, 0, sizeof(pv_value_t));
 	val.ri = lua_tointeger(L, -1);
 	val.ri = lua_tointeger(L, -1);
 	val.flags |= PV_TYPE_INT|PV_VAL_INT;
 	val.flags |= PV_TYPE_INT|PV_VAL_INT;
-	
+
 	pvn.s = (char*)lua_tostring(L, -2);
 	pvn.s = (char*)lua_tostring(L, -2);
 	if(pvn.s==NULL || env_L->msg==NULL)
 	if(pvn.s==NULL || env_L->msg==NULL)
 		return 0;
 		return 0;
@@ -982,7 +982,7 @@ static int lua_sr_pv_sets (lua_State *L)
 {
 {
 	str pvn;
 	str pvn;
 	pv_spec_t *pvs;
 	pv_spec_t *pvs;
-    pv_value_t val;
+	pv_value_t val;
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 	int pl;
 	int pl;
 
 
@@ -997,7 +997,7 @@ static int lua_sr_pv_sets (lua_State *L)
 	if(!lua_isstring(L, -1))
 	if(!lua_isstring(L, -1))
 	{
 	{
 		LM_ERR("Cannot convert to a string when assigning value to variable: %s\n",
 		LM_ERR("Cannot convert to a string when assigning value to variable: %s\n",
-			   lua_tostring(L, -2));
+				lua_tostring(L, -2));
 		return 0;
 		return 0;
 	}
 	}
 
 
@@ -1005,7 +1005,7 @@ static int lua_sr_pv_sets (lua_State *L)
 	val.rs.s = (char*)lua_tostring(L, -1);
 	val.rs.s = (char*)lua_tostring(L, -1);
 	val.rs.len = strlen(val.rs.s);
 	val.rs.len = strlen(val.rs.s);
 	val.flags |= PV_VAL_STR;
 	val.flags |= PV_VAL_STR;
-	
+
 	pvn.s = (char*)lua_tostring(L, -2);
 	pvn.s = (char*)lua_tostring(L, -2);
 	if(pvn.s==NULL || env_L->msg==NULL)
 	if(pvn.s==NULL || env_L->msg==NULL)
 		return 0;
 		return 0;
@@ -1040,7 +1040,7 @@ static int lua_sr_pv_unset (lua_State *L)
 {
 {
 	str pvn;
 	str pvn;
 	pv_spec_t *pvs;
 	pv_spec_t *pvs;
-    pv_value_t val;
+	pv_value_t val;
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 	int pl;
 	int pl;
 
 
@@ -1082,7 +1082,7 @@ static int lua_sr_pv_is_null (lua_State *L)
 {
 {
 	str pvn;
 	str pvn;
 	pv_spec_t *pvs;
 	pv_spec_t *pvs;
-    pv_value_t val;
+	pv_value_t val;
 	sr_lua_env_t *env_L;
 	sr_lua_env_t *env_L;
 	int pl;
 	int pl;
 
 

+ 1 - 1
modules/app_lua/app_lua_sr.h

@@ -1,5 +1,5 @@
 /**
 /**
- * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com)
+ * Copyright (C) 2010-2016 Daniel-Constantin Mierla (asipto.com)
  *
  *
  * This file is part of Kamailio, a free SIP server.
  * This file is part of Kamailio, a free SIP server.
  *
  *