浏览代码

siputils: replace STR_PARAM with PARAM_STR

Alekzander Spiridonov 11 年之前
父节点
当前提交
86aee26f72
共有 1 个文件被更改,包括 8 次插入16 次删除
  1. 8 16
      modules/siputils/siputils.c

+ 8 - 16
modules/siputils/siputils.c

@@ -180,14 +180,14 @@ static cmd_export_t cmds[]={
 
 static param_export_t params[] = {
 	{"ring_timeout",            INT_PARAM, &default_siputils_cfg.ring_timeout},
-	{"options_accept",          STR_PARAM, &opt_accept.s},
-	{"options_accept_encoding", STR_PARAM, &opt_accept_enc.s},
-	{"options_accept_language", STR_PARAM, &opt_accept_lang.s},
-	{"options_support",         STR_PARAM, &opt_supported.s},
-	{"contact_flds_separator",  STR_PARAM, &contact_flds_separator},
-	{"rpid_prefix",             STR_PARAM, &rpid_prefix.s  },
-	{"rpid_suffix",             STR_PARAM, &rpid_suffix.s  },
-	{"rpid_avp",                STR_PARAM, &rpid_avp_param },
+	{"options_accept",          PARAM_STR, &opt_accept},
+	{"options_accept_encoding", PARAM_STR, &opt_accept_enc},
+	{"options_accept_language", PARAM_STR, &opt_accept_lang},
+	{"options_support",         PARAM_STR, &opt_supported},
+	{"contact_flds_separator",  PARAM_STRING, &contact_flds_separator},
+	{"rpid_prefix",             PARAM_STR, &rpid_prefix  },
+	{"rpid_suffix",             PARAM_STR, &rpid_suffix  },
+	{"rpid_avp",                PARAM_STRING, &rpid_avp_param },
 	{0, 0, 0}
 };
 
@@ -236,18 +236,10 @@ static int mod_init(void)
 		return -1;
 	}
 
-	rpid_prefix.len = strlen(rpid_prefix.s);
-	rpid_suffix.len = strlen(rpid_suffix.s);
-
 	if(cfg_declare("siputils", siputils_cfg_def, &default_siputils_cfg, cfg_sizeof(siputils), &siputils_cfg)){
 		LM_ERR("Fail to declare the configuration\n");
 		return -1;
 	}
-	
-	opt_accept.len = strlen(opt_accept.s);
-	opt_accept_enc.len = strlen(opt_accept_enc.s);
-	opt_accept_lang.len = strlen(opt_accept_lang.s);
-	opt_supported.len = strlen(opt_supported.s);
 
 	return 0;
 }