From 70dd4c0d6a50ad859006da2ecf0ff04688530dc9 Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Tue, 21 Nov 2023 23:16:08 +1100
Subject: [PATCH] prepare resolve field name for the future
---
src/include/66/service.h | 6 +++---
src/lib66/environ/env_resolve_conf.c | 4 ++--
src/lib66/exec/ssexec_remove.c | 2 +-
src/lib66/exec/ssexec_resolve.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/include/66/service.h b/src/include/66/service.h
index 5f339aad..9d4605b9 100644
--- a/src/include/66/service.h
+++ b/src/include/66/service.h
@@ -181,7 +181,7 @@ struct resolve_service_s
uint32_t owner ; // integer, uid of the owner
uint32_t treename ; // string
uint32_t user ; // string
- uint32_t inmodule ; // string, name of the module which depend on
+ uint32_t inns ; // string, name of the namespace(module) which depend on
uint32_t enabled ; // integer, 0 not enabled
resolve_service_addon_path_t path ;
@@ -222,7 +222,7 @@ enum resolve_service_enum_e
E_RESOLVE_SERVICE_OWNER,
E_RESOLVE_SERVICE_TREENAME,
E_RESOLVE_SERVICE_USER,
- E_RESOLVE_SERVICE_INMODULE,
+ E_RESOLVE_SERVICE_INNS,
E_RESOLVE_SERVICE_ENABLED,
// path
@@ -327,7 +327,7 @@ extern void service_db_migrate(resolve_service_t *old, resolve_service_t *new, c
typedef struct ss_state_s ss_state_t, *ss_state_t_ref ;
/** Graph */
-extern void service_graph_g(char const *alist, size_t alen, graph_t *graph, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info, uint32_t flag) ;
+extern void service_graph_g(char const *slist, size_t slen, graph_t *graph, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info, uint32_t flag) ;
extern void service_graph_collect(graph_t *g, char const *alist, size_t alen, resolve_service_t *ares, unsigned int *areslen, ssexec_t *info, uint32_t flag) ;
extern void service_graph_build(graph_t *g, resolve_service_t *ares, unsigned int areslen, uint32_t flag) ;
diff --git a/src/lib66/environ/env_resolve_conf.c b/src/lib66/environ/env_resolve_conf.c
index 5e078288..ed99abf6 100644
--- a/src/lib66/environ/env_resolve_conf.c
+++ b/src/lib66/environ/env_resolve_conf.c
@@ -42,8 +42,8 @@ int env_resolve_conf(stralloc *env, resolve_service_t *res)
return 0 ;
}
- if (res->inmodule)
- if (!auto_stra(env, res->sa.s + res->inmodule, SS_SYM_VERSION, "/"))
+ if (res->inns)
+ if (!auto_stra(env, res->sa.s + res->inns, SS_SYM_VERSION, "/"))
return 0 ;
if (!auto_stra(env, res->sa.s + res->name))
diff --git a/src/lib66/exec/ssexec_remove.c b/src/lib66/exec/ssexec_remove.c
index efc98ad0..d2fa5c92 100644
--- a/src/lib66/exec/ssexec_remove.c
+++ b/src/lib66/exec/ssexec_remove.c
@@ -57,7 +57,7 @@ static void remove_service(resolve_service_t *res, ssexec_t *info)
tree_service_remove(info->base.s, res->sa.s + res->treename, res->sa.s + res->name) ;
- if ((res->logger.want && (res->type == TYPE_CLASSIC || res->type == TYPE_ONESHOT)) && !res->inmodule) {
+ if ((res->logger.want && (res->type == TYPE_CLASSIC || res->type == TYPE_ONESHOT)) && !res->inns) {
resolve_service_t lres = RESOLVE_SERVICE_ZERO ;
resolve_wrapper_t_ref lwres = resolve_set_struct(DATA_SERVICE, &lres) ;
diff --git a/src/lib66/exec/ssexec_resolve.c b/src/lib66/exec/ssexec_resolve.c
index b1d253d2..1fa83425 100644
--- a/src/lib66/exec/ssexec_resolve.c
+++ b/src/lib66/exec/ssexec_resolve.c
@@ -91,7 +91,7 @@ static void info_display_service_field(resolve_service_t *res)
info_display_int(fields[m++], res->owner) ;
info_display_string(fields[m++], res->sa.s, res->treename, 1) ;
info_display_string(fields[m++], res->sa.s, res->user, 1) ;
- info_display_string(fields[m++], res->sa.s, res->inmodule, 1) ;
+ info_display_string(fields[m++], res->sa.s, res->inns, 1) ;
info_display_int(fields[m++], res->enabled) ;
info_display_string(fields[m++], res->sa.s, res->path.home, 1) ;
--
GitLab