module dependencies core: properly handle the USE_FUNC_PARAM

OpenSIPS · Aug 13, 2014 · 8d4b329 · 8d4b329
1 parent 5b470b8
commit 8d4b329
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/modules/avpops/avpops.c b/modules/avpops/avpops.c
@@ -180,22 +180,12 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static module_dependency_t *get_deps_db_url(param_export_t *param)
-{
-	char *db_url = *(char **)param->param_pointer;
-
-	if (!db_url || strlen(db_url) == 0)
-		return NULL;
-
-	return alloc_module_dep(MOD_TYPE_SQLDB, NULL);
-}
-
 static dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL },
 	},
 	{ /* modparam dependencies */
-		{ "db_url", get_deps_db_url },
+		{ "db_url", get_deps_sqldb_url },
 		{ NULL, NULL },
 	},
 };

diff --git a/sr_module_deps.c b/sr_module_deps.c
@@ -65,6 +65,9 @@ module_dependency_t *get_deps_sqldb_url(param_export_t *param)
 {
 	char *db_url = *(char **)param->param_pointer;
 
+	if (param->type & USE_FUNC_PARAM)
+		return alloc_module_dep(MOD_TYPE_SQLDB, NULL);
+
 	if (!db_url || strlen(db_url) == 0)
 		return NULL;