matrix: replace STR_PARAM with PARAM_STR

modules/matrix/db_matrix.c

@@ -97,16 +97,3 @@ int matrix_db_open(void) {
 	return 0;
 }
 
-
-/*!
- * Update the variable length after eventual assignments from the config script.
- * This is necessary because we're using the 'str' type.
- */
-void matrix_db_vars(void) {
-	if (matrix_db_url.s) matrix_db_url.len = strlen(matrix_db_url.s);
-	matrix_table.len = strlen(matrix_table.s);
-	matrix_first_col.len = strlen(matrix_first_col.s);
-	matrix_second_col.len = strlen(matrix_second_col.s);
-	matrix_res_col.len = strlen(matrix_res_col.s);
-}
-

modules/matrix/db_matrix.h

@@ -35,9 +35,9 @@ extern str matrix_db_url;
 extern db1_con_t * matrix_dbh;
 extern db_func_t matrix_dbf;
 
-#define matrix_DB_URL { "db_url", STR_PARAM, &matrix_db_url.s },
+#define matrix_DB_URL { "db_url", PARAM_STR, &matrix_db_url },
 
-#define matrix_DB_TABLE { "matrix_table", STR_PARAM, &matrix_table.s },
+#define matrix_DB_TABLE { "matrix_table", PARAM_STR, &matrix_table },
 
 extern str matrix_table;
 
@@ -46,9 +46,9 @@ extern str matrix_first_col;
 extern str matrix_second_col;
 extern str matrix_res_col;
 #define matrix_DB_COLS \
-{ "matrix_first_col", STR_PARAM, &matrix_first_col.s }, \
-{ "matrix_second_col", STR_PARAM, &matrix_second_col.s }, \
-{ "matrix_res_col", STR_PARAM, &matrix_res_col.s }, \
+{ "matrix_first_col", PARAM_STR, &matrix_first_col }, \
+{ "matrix_second_col", PARAM_STR, &matrix_second_col }, \
+{ "matrix_res_col", PARAM_STR, &matrix_res_col }, \
 
 /* table version */
 extern const unsigned int matrix_version;
@@ -76,10 +76,4 @@ int matrix_db_init(void);
  */
 int matrix_db_open(void);
 
-/*!
- * Update the variable length after eventual assignments from the config script.
- * This is necessary because we're using the 'str' type.
- */
-void matrix_db_vars(void);
-
 #endif

modules/matrix/matrix.c

@@ -582,8 +582,6 @@ static void destroy_matrix(void)
 
 static int mod_init(void)
 {
-	matrix_db_vars();
-
 	if(register_mi_mod(exports.name, mi_cmds)!=0)
 	{
 		LM_ERR("failed to register MI commands\n");