diff --git a/src/lib66/utils/module_in_cmdline.c b/src/lib66/utils/module_in_cmdline.c index ed54ae9757b843d7db1692d7822a1d2f239ef5d5..06d297b2b2388b20063bdc1c467434c38d2f3814 100644 --- a/src/lib66/utils/module_in_cmdline.c +++ b/src/lib66/utils/module_in_cmdline.c @@ -29,15 +29,15 @@ int module_in_cmdline(genalloc *gares, resolve_service_t *res, char const *dir) log_flow() ; int e = 0 ; - stralloc tmp = STRALLOC_ZERO ; +/* stralloc tmp = STRALLOC_ZERO ; size_t pos = 0 ; resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, res) ; if (!resolve_append(gares,wres)) goto err ; - if (res->contents) + if (res->dependencies.depends) { - if (!sastr_clean_string(&tmp,res->sa.s + res->contents)) + if (!sastr_clean_string(&tmp,res->sa.s + res->dependencies.depends)) goto err ; } for (; pos < tmp.len ; pos += strlen(tmp.s + pos) + 1) @@ -55,5 +55,5 @@ int module_in_cmdline(genalloc *gares, resolve_service_t *res, char const *dir) err: free(wres) ; stralloc_free(&tmp) ; - return e ; + */ return e ; } diff --git a/src/lib66/utils/module_search_service.c b/src/lib66/utils/module_search_service.c index 6544a5892c9d3317bf0457568da79cb43a59e251..5aa0e655c02578872bda4a4c253c9bc8e23ea2ea 100644 --- a/src/lib66/utils/module_search_service.c +++ b/src/lib66/utils/module_search_service.c @@ -49,9 +49,9 @@ int module_search_service(char const *src, genalloc *gares, char const *name,uin { char *dname = list.s + pos ; if (!resolve_read(wres,src,dname)) goto err ; - if (res.type == TYPE_MODULE && res.contents) + if (res.type == TYPE_MODULE && res.dependencies.depends) { - if (!sastr_clean_string(&tmp,res.sa.s + res.contents)) goto err ; + if (!sastr_clean_string(&tmp,res.sa.s + res.dependencies.depends)) goto err ; for (deps = 0 ; deps < tmp.len ; deps += strlen(tmp.s + deps) + 1) { if (!strcmp(name,tmp.s + deps))