From daa71b2330c4a82f6028f866d56bd7548f5c5fec Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Sat, 15 Oct 2022 20:24:31 +1100
Subject: [PATCH] pass to the new format of resolve file. Note: this function
should dissappear
---
src/lib66/utils/module_in_cmdline.c | 8 ++++----
src/lib66/utils/module_search_service.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib66/utils/module_in_cmdline.c b/src/lib66/utils/module_in_cmdline.c
index ed54ae97..06d297b2 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 6544a589..5aa0e655 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))
--
GitLab