瀏覽代碼

ims_usrloc_scscf: Replacing STR_PARAM with PARAM_STRING or PARAM_STR to give up of depracated defines

Alekzander Spiridonov 11 年之前
父節點
當前提交
6864c39077
共有 1 個文件被更改,包括 4 次插入9 次删除
  1. 4 9
      modules/ims_usrloc_scscf/ul_mod.c

+ 4 - 9
modules/ims_usrloc_scscf/ul_mod.c

@@ -142,17 +142,17 @@ static param_export_t params[] = {
 	{"hash_size",         	INT_PARAM, &ul_hash_size    },
 	{"subs_hash_size",    	INT_PARAM, &subs_hash_size  },
 	{"nat_bflag",         	INT_PARAM, &nat_bflag       },
-	{"usrloc_debug_file", 	STR_PARAM, &usrloc_debug_file.s},
+	{"usrloc_debug_file", 	PARAM_STR, &usrloc_debug_file},
 	{"enable_debug_file", 	INT_PARAM, &usrloc_debug},
-    {"user_data_dtd",     	STR_PARAM, &scscf_user_data_dtd},
-    {"user_data_xsd",     	STR_PARAM, &scscf_user_data_xsd},
+    {"user_data_dtd",     	PARAM_STRING, &scscf_user_data_dtd},
+    {"user_data_xsd",     	PARAM_STRING, &scscf_user_data_xsd},
     {"support_wildcardPSI",	INT_PARAM, &scscf_support_wildcardPSI},
     {"unreg_validity",		INT_PARAM, &unreg_validity},
     {"maxcontact_behaviour",INT_PARAM, &maxcontact_behaviour},
     {"maxcontact",			INT_PARAM, &maxcontact},
     {"sub_dialog_hash_size",INT_PARAM, &sub_dialog_hash_size},
     {"db_mode",				INT_PARAM, &db_mode},
-    {"db_url", 				STR_PARAM, &db_url.s},
+    {"db_url", 				PARAM_STR, &db_url},
 	{0, 0, 0}
 };
 
@@ -210,11 +210,6 @@ static int mod_init(void) {
 		return -1;
 	}
 
-	db_url.len = strlen(db_url.s);
-
-	/* Compute the lengths of string parameters */
-	usrloc_debug_file.len = strlen(usrloc_debug_file.s);
-
 	if (ul_hash_size <= 1)
 		ul_hash_size = 512;
 	else