Ver Fonte

presence_xml: replace STR_PARAM with PARAM_STRING

Alekzander Spiridonov há 11 anos atrás
pai
commit
ea76a64b3e
1 ficheiros alterados com 4 adições e 9 exclusões
  1. 4 9
      modules/presence_xml/presence_xml.c

+ 4 - 9
modules/presence_xml/presence_xml.c

@@ -119,17 +119,17 @@ static cmd_export_t cmds[]={
 };
 
 static param_export_t params[]={
-	{ "db_url",		STR_PARAM, &db_url.s},
-	{ "xcap_table",		STR_PARAM, &xcap_table.s},
+	{ "db_url",		PARAM_STR, &db_url},
+	{ "xcap_table",		PARAM_STR, &xcap_table},
 	{ "force_active",	INT_PARAM, &force_active },
 	{ "integrated_xcap_server", INT_PARAM, &integrated_xcap_server},
-	{ "xcap_server",     	STR_PARAM|USE_FUNC_PARAM,(void*)pxml_add_xcap_server},
+	{ "xcap_server",     	PARAM_STRING|USE_FUNC_PARAM,(void*)pxml_add_xcap_server},
 	{ "disable_presence",	INT_PARAM, &disable_presence },
 	{ "disable_winfo",		INT_PARAM, &disable_winfo },
 	{ "disable_bla",		INT_PARAM, &disable_bla },
 	{ "disable_xcapdiff",	INT_PARAM, &disable_xcapdiff },
 	{ "passive_mode",		INT_PARAM, &passive_mode },
-	{ "xcapauth_userdel_reason", STR_PARAM, &xcapauth_userdel_reason.s},
+	{ "xcapauth_userdel_reason", PARAM_STR, &xcapauth_userdel_reason},
 	{ 0, 0, 0}
 };
 
@@ -172,12 +172,7 @@ static int mod_init(void)
 		return -1;
 	}
 
-	xcapauth_userdel_reason.len = strlen(xcapauth_userdel_reason.s);
-
-	db_url.len = db_url.s ? strlen(db_url.s) : 0;
 	LM_DBG("db_url=%s/%d/%p\n",ZSW(db_url.s),db_url.len, db_url.s);
-	xcap_table.len = xcap_table.s ? strlen(xcap_table.s) : 0;
-	
 
 	/* bind the SL API */
 	if (sl_load_api(&slb)!=0) {