From 17a23f8709feb8ad08e9daf4818faeeb940765dd Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Mon, 10 Jan 2022 17:43:41 +1100
Subject: [PATCH] rename SERVICE_STRUCT to DATA_SERVICE and TREE_STRUCT to
DATA_STRUCT
---
src/66/66-inservice.c | 67 ++----------------------------------
src/66/66-instate.c | 2 +-
src/lib66/parser_write.c | 2 +-
src/lib66/ss_resolve_graph.c | 14 ++++----
src/lib66/ssexec_dbctl.c | 8 ++---
src/lib66/ssexec_disable.c | 18 +++++-----
src/lib66/ssexec_enable.c | 14 ++++----
src/lib66/ssexec_env.c | 2 +-
src/lib66/ssexec_init.c | 4 +--
src/lib66/ssexec_start.c | 12 +++----
src/lib66/ssexec_stop.c | 8 ++---
src/lib66/ssexec_svctl.c | 2 +-
src/lib66/utils.c | 6 ++--
13 files changed, 49 insertions(+), 110 deletions(-)
diff --git a/src/66/66-inservice.c b/src/66/66-inservice.c
index 7e56c6ee..6648b539 100644
--- a/src/66/66-inservice.c
+++ b/src/66/66-inservice.c
@@ -340,67 +340,6 @@ static void info_display_live(char const *field,resolve_service_t *res)
if (NOFIELD) info_display_field_name(field) ;
info_display_string(res->sa.s + res->runat) ;
}
-/**
- *
- *
- * bugged function
- *
- *
-void ss_graph_matrix_add_classic(graph_t *g, genalloc *gares)
-{
- size_t pos = 0, bpos = 0, ccount = 0 ;
- size_t cl[SS_MAX_SERVICE] ;
-
- for (; pos < genalloc_len(resolve_service_t, gares) ; pos++) {
-
- resolve_service_t_ref res = &genalloc_s(resolve_service_t, gares)[pos] ;
-
- if (res->type == TYPE_CLASSIC) {
-
- cl[ccount++] = pos ;
-
- }
- }
-
- if (ccount) {
-
- for (pos = 0 ; pos < ccount ; pos++) {
-
- char *str = genalloc_s(resolve_service_t, gares)[cl[pos]].sa.s ;
- char *sv = str + genalloc_s(resolve_service_t, gares)[cl[pos]].name ;
-
- graph_array_reverse(g->sort, g->sort_count) ;
-
- for (bpos = 0 ; bpos < g->sort_count ; bpos++) {
-
- char *service = g->data.s + genalloc_s(graph_hash_t,&g->hash)[g->sort[bpos]].vertex ;
-
- int idx = resolve_search(gares, service, SERVICE_STRUCT) ;
- if (genalloc_s(resolve_service_t, gares)[idx].type == TYPE_CLASSIC ||
- !strcmp(service, sv))
- continue ;
-
- if (!graph_edge_add_g(g, service, sv))
- log_die(LOG_EXIT_SYS,"add edge: ", sv, " at vertex: ", service) ;
-
- graph_free_matrix(g) ;
- graph_free_sort(g) ;
-
- if (!graph_matrix_build(g)) {
- graph_free_all(g) ;
- log_dieu(LOG_EXIT_SYS,"build the graph") ;
- }
-
- if (!graph_matrix_analyze_cycle(g))
- log_die(LOG_EXIT_SYS,"found cycle") ;
- }
-
- graph_array_reverse(g->sort, g->sort_count) ;
- }
- }
-
-}
-*/
static void info_display_requiredby(char const *field, resolve_service_t *res)
{
@@ -411,7 +350,7 @@ static void info_display_requiredby(char const *field, resolve_service_t *res)
if (NOFIELD) padding = info_display_field_name(field) ;
else { field = 0 ; padding = 0 ; }
- if (!graph_service_build_bytree(&graph, res->sa.s + res->tree, 2))
+ if (!graph_build_service_bytree(&graph, res->sa.s + res->tree, 2))
log_dieu(LOG_EXIT_SYS,"build the graph dependencies") ;
unsigned int list[graph.mlen] ;
@@ -482,7 +421,7 @@ static void info_display_deps(char const *field, resolve_service_t *res)
if (NOFIELD) padding = info_display_field_name(field) ;
else { field = 0 ; padding = 0 ; }
- if (!graph_service_build_bytree(&graph, res->sa.s + res->tree, 2))
+ if (!graph_build_service_bytree(&graph, res->sa.s + res->tree, 2))
log_dieu(LOG_EXIT_SYS,"build the graph dependencies") ;
unsigned int list[graph.mlen] ;
@@ -968,7 +907,7 @@ int main(int argc, char const *const *argv, char const *const *envp)
char ownerstr[UID_FMT] ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
stralloc satree = STRALLOC_ZERO ;
log_color = &log_color_disable ;
diff --git a/src/66/66-instate.c b/src/66/66-instate.c
index 9163ddcb..a004a398 100644
--- a/src/66/66-instate.c
+++ b/src/66/66-instate.c
@@ -88,7 +88,7 @@ int main(int argc, char const *const *argv)
int found = 0 ;
uint8_t logger = 0 ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
stralloc satree = STRALLOC_ZERO ;
stralloc src = STRALLOC_ZERO ;
stralloc tmp = STRALLOC_ZERO ;
diff --git a/src/lib66/parser_write.c b/src/lib66/parser_write.c
index f7fdefe7..9fe60566 100644
--- a/src/lib66/parser_write.c
+++ b/src/lib66/parser_write.c
@@ -57,7 +57,7 @@ int write_services(sv_alltype *sv, char const *workdir, uint8_t force, uint8_t c
{
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
if (resolve_check(workdir,name))
{
if (!resolve_read(wres,workdir,name)) log_dieusys(LOG_EXIT_SYS,"read resolve file of: ",name) ;
diff --git a/src/lib66/ss_resolve_graph.c b/src/lib66/ss_resolve_graph.c
index f959c609..32ad4fc6 100644
--- a/src/lib66/ss_resolve_graph.c
+++ b/src/lib66/ss_resolve_graph.c
@@ -41,7 +41,7 @@ void ss_resolve_graph_free(ss_resolve_graph_t *graph)
{
log_flow() ;
- resolve_deep_free(SERVICE_STRUCT, &graph->name) ;
+ resolve_deep_free(DATA_SERVICE, &graph->name) ;
genalloc_deepfree(ss_resolve_graph_ndeps_t,&graph->cp,ss_resolve_graph_ndeps_free) ;
genalloc_free(resolve_service_t,&graph->sorted) ;
}
@@ -116,14 +116,14 @@ int ss_resolve_graph_publish(ss_resolve_graph_t *graph,unsigned int reverse)
ss_resolve_graph_ndeps_t rescp = RESOLVE_GRAPH_NDEPS_ZERO ;
rescp.idx = a ;
- if (genalloc_s(resolve_service_t,&graph->name)[a].ndeps)
+ if (genalloc_s(resolve_service_t,&graph->name)[a].ndepends)
{
sa.len = 0 ;
- if (!sastr_clean_string(&sa, genalloc_s(resolve_service_t,&graph->name)[a].sa.s + genalloc_s(resolve_service_t,&graph->name)[a].deps)) goto err ;
+ if (!sastr_clean_string(&sa, genalloc_s(resolve_service_t,&graph->name)[a].sa.s + genalloc_s(resolve_service_t,&graph->name)[a].depends)) goto err ;
for (b = 0 ; b < sa.len ; b += strlen(sa.s + b) + 1)
{
char *deps = sa.s + b ;
- r = resolve_search(&graph->name,deps, SERVICE_STRUCT) ;
+ r = resolve_search(&graph->name,deps, DATA_SERVICE) ;
if (r >= 0)
{
if (!genalloc_append(uint32_t,&rescp.ndeps,&r)) goto err ;
@@ -151,9 +151,9 @@ int ss_resolve_graph_build(ss_resolve_graph_t *graph,resolve_service_t *res,char
int r, e = 0 ;
char *string = res->sa.s ;
char *name = string + res->name ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, res) ;
- r = resolve_search(&graph->name, name, SERVICE_STRUCT) ;
+ r = resolve_search(&graph->name, name, DATA_SERVICE) ;
if (r < 0)
{
if (!obstr_equal(name,SS_MASTER+1))
@@ -194,7 +194,7 @@ int ss_resolve_graph_src(ss_resolve_graph_t *graph, char const *dir, unsigned in
stralloc sa = STRALLOC_ZERO ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
size_t dirlen = strlen(dir), pos = 0 ;
char const *exclude[2] = { 0 } ;
diff --git a/src/lib66/ssexec_dbctl.c b/src/lib66/ssexec_dbctl.c
index 91f82ec5..d1008c20 100644
--- a/src/lib66/ssexec_dbctl.c
+++ b/src/lib66/ssexec_dbctl.c
@@ -228,7 +228,7 @@ int ssexec_dbctl(int argc, char const *const *argv,char const *const *envp,ssexe
stralloc sares = STRALLOC_ZERO ;
ss_resolve_graph_t graph = RESOLVE_GRAPH_ZERO ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
up = down = reload = ret = reverse = 0 ;
@@ -267,7 +267,7 @@ int ssexec_dbctl(int argc, char const *const *argv,char const *const *envp,ssexe
if (!resolve_check(sares.s,mainsv)) log_diesys(LOG_EXIT_SYS,"inner bundle doesn't exit -- please make a bug report") ;
if (!resolve_read(wres,sares.s,mainsv)) log_dieusys(LOG_EXIT_SYS,"read resolve file of inner bundle") ;
- if (res.ndeps)
+ if (res.ndepends)
{
if (!resolve_append(&gares,wres)) log_dieusys(LOG_EXIT_SYS,"append services selection with inner bundle") ;
}
@@ -331,7 +331,7 @@ int ssexec_dbctl(int argc, char const *const *argv,char const *const *envp,ssexe
{
int ireverse = reverse ;
int logname = get_rstrlen_until(genalloc_s(resolve_service_t,&gares)[i].sa.s + genalloc_s(resolve_service_t,&gares)[i].name,SS_LOG_SUFFIX) ;
- if (logname > 0 && (!resolve_cmp(&gares,genalloc_s(resolve_service_t,&gares)[i].sa.s + genalloc_s(resolve_service_t,&gares)[i].logassoc, SERVICE_STRUCT)) && down)
+ if (logname > 0 && (!resolve_cmp(&gares,genalloc_s(resolve_service_t,&gares)[i].sa.s + genalloc_s(resolve_service_t,&gares)[i].logassoc, DATA_SERVICE)) && down)
ireverse = 1 ;
if (reload) ireverse = 1 ;
@@ -357,7 +357,7 @@ int ssexec_dbctl(int argc, char const *const *argv,char const *const *envp,ssexe
stralloc_free(&sares) ;
ss_resolve_graph_free(&graph) ;
resolve_free(wres) ;
- resolve_deep_free(SERVICE_STRUCT, &gares) ;
+ resolve_deep_free(DATA_SERVICE, &gares) ;
return ret ;
}
diff --git a/src/lib66/ssexec_disable.c b/src/lib66/ssexec_disable.c
index c888fe50..6a5c7019 100644
--- a/src/lib66/ssexec_disable.c
+++ b/src/lib66/ssexec_disable.c
@@ -57,7 +57,7 @@ int svc_remove(genalloc *tostop,resolve_service_t *res, char const *src,ssexec_t
genalloc rdeps = GENALLOC_ZERO ;
stralloc dst = STRALLOC_ZERO ;
resolve_service_t cp = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &cp) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &cp) ;
ss_state_t sta = STATE_ZERO ;
size_t newlen ;
@@ -102,7 +102,7 @@ int svc_remove(genalloc *tostop,resolve_service_t *res, char const *src,ssexec_t
for (;i < genalloc_len(resolve_service_t,&rdeps) ; i++)
{
resolve_service_t_ref pres = &genalloc_s(resolve_service_t,&rdeps)[i] ;
- resolve_wrapper_t_ref dwres = resolve_set_struct(SERVICE_STRUCT, pres) ;
+ resolve_wrapper_t_ref dwres = resolve_set_struct(DATA_SERVICE, pres) ;
char *str = pres->sa.s ;
char *name = str + pres->name ;
char *ste = str + pres->state ;
@@ -172,7 +172,7 @@ int svc_remove(genalloc *tostop,resolve_service_t *res, char const *src,ssexec_t
log_trace("Delete resolve file of: ",name) ;
resolve_rmfile(src,name) ;
}
- if (!resolve_cmp(tostop, name, SERVICE_STRUCT))
+ if (!resolve_cmp(tostop, name, DATA_SERVICE))
if (!resolve_append(tostop,wres)) goto err ;
free(dwres) ;
@@ -182,7 +182,7 @@ int svc_remove(genalloc *tostop,resolve_service_t *res, char const *src,ssexec_t
err:
resolve_free(wres) ;
- resolve_deep_free(SERVICE_STRUCT, &rdeps) ;
+ resolve_deep_free(DATA_SERVICE, &rdeps) ;
stralloc_free(&dst) ;
return e ;
}
@@ -196,7 +196,7 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse
genalloc gares = GENALLOC_ZERO ; //resolve_service_t
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
resolve_service_t_ref pres ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
r = nclassic = nlongrun = stop = logname = force = 0 ;
@@ -291,7 +291,7 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse
log_die_nclean(LOG_EXIT_USER,&cleanup,"nice try peon") ;
logname = get_rstrlen_until(name,SS_LOG_SUFFIX) ;
- if (logname > 0 && (!resolve_cmp(&gares, string + pres->logassoc, SERVICE_STRUCT)))
+ if (logname > 0 && (!resolve_cmp(&gares, string + pres->logassoc, DATA_SERVICE)))
log_die_nclean(LOG_EXIT_USER,&cleanup,"logger detected - disabling is not allowed") ;
if (!pres->disen && !FORCE)
@@ -345,7 +345,7 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse
stralloc_free(&workdir) ;
resolve_free(wres) ;
- resolve_deep_free(SERVICE_STRUCT, &gares) ;
+ resolve_deep_free(DATA_SERVICE, &gares) ;
for (unsigned int i = 0 ; i < genalloc_len(resolve_service_t,&tostop); i++)
log_info("Disabled successfully: ",genalloc_s(resolve_service_t,&tostop)[i].sa.s + genalloc_s(resolve_service_t,&tostop)[i].name) ;
@@ -366,12 +366,12 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse
if (ssexec_stop(nargc,newargv,envp,info))
{
- resolve_deep_free(SERVICE_STRUCT, &tostop) ;
+ resolve_deep_free(DATA_SERVICE, &tostop) ;
return 111 ;
}
}
- resolve_deep_free(SERVICE_STRUCT, &tostop) ;
+ resolve_deep_free(DATA_SERVICE, &tostop) ;
return 0 ;
}
diff --git a/src/lib66/ssexec_enable.c b/src/lib66/ssexec_enable.c
index 4ef606cf..c88fda1a 100644
--- a/src/lib66/ssexec_enable.c
+++ b/src/lib66/ssexec_enable.c
@@ -65,8 +65,8 @@ static void check_identifier(char const *name)
log_flow() ;
int logname = get_rstrlen_until(name,SS_LOG_SUFFIX) ;
- if (logname > 0) log_die(LOG_EXIT_USER,"service: ",name,": ends with reserved suffix -log") ;
- if (!memcmp(name, SS_MASTER + 1, 6)) log_die(LOG_EXIT_USER,"service: ",name,": starts with reserved prefix Master") ;
+ if (logname > 0) log_die(LOG_EXIT_USER,"service name: ",name,": ends with reserved suffix -log") ;
+ if (!memcmp(name, SS_MASTER + 1, 6)) log_die(LOG_EXIT_USER,"service name: ",name,": starts with reserved prefix Master") ;
if (!strcmp(name,SS_SERVICE)) log_die(LOG_EXIT_USER,"service as service name is a reserved name") ;
if (!strcmp(name,"service@")) log_die(LOG_EXIT_USER,"service@ as service name is a reserved name") ;
}
@@ -186,8 +186,8 @@ void start_write(stralloc *tostart,unsigned int *nclassic,unsigned int *nlongrun
size_t workdirlen = strlen(workdir) ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
resolve_service_t dres = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
- resolve_wrapper_t_ref dwres = resolve_set_struct(SERVICE_STRUCT, &dres) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
+ resolve_wrapper_t_ref dwres = resolve_set_struct(DATA_SERVICE, &dres) ;
stralloc salist = STRALLOC_ZERO ;
genalloc gamodule = GENALLOC_ZERO ;
ss_resolve_graph_t mgraph = RESOLVE_GRAPH_ZERO ;
@@ -223,7 +223,7 @@ void start_write(stralloc *tostart,unsigned int *nclassic,unsigned int *nlongrun
if (dres.type != TYPE_CLASSIC)
{
- if (resolve_search(&gamodule, name, SERVICE_STRUCT) == -1)
+ if (resolve_search(&gamodule, name, DATA_SERVICE) == -1)
{
if (!resolve_append(&gamodule,dwres))
{
@@ -274,7 +274,7 @@ void start_write(stralloc *tostart,unsigned int *nclassic,unsigned int *nlongrun
goto err ;
}
- resolve_deep_free(SERVICE_STRUCT, &gamodule) ;
+ resolve_deep_free(DATA_SERVICE, &gamodule) ;
ss_resolve_graph_free(&mgraph) ;
}
@@ -283,7 +283,7 @@ void start_write(stralloc *tostart,unsigned int *nclassic,unsigned int *nlongrun
return ;
err:
- resolve_deep_free(SERVICE_STRUCT, &gamodule) ;
+ resolve_deep_free(DATA_SERVICE, &gamodule) ;
ss_resolve_graph_free(&mgraph) ;
resolve_free(wres) ;
resolve_free(dwres) ;
diff --git a/src/lib66/ssexec_env.c b/src/lib66/ssexec_env.c
index 4c6389ec..2a400ef1 100644
--- a/src/lib66/ssexec_env.c
+++ b/src/lib66/ssexec_env.c
@@ -214,7 +214,7 @@ int ssexec_env(int argc, char const *const *argv,char const *const *envp,ssexec_
stralloc savar = STRALLOC_ZERO ;
stralloc salist = STRALLOC_ZERO ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
uint8_t todo = T_UNSET ;
diff --git a/src/lib66/ssexec_init.c b/src/lib66/ssexec_init.c
index e1a14016..ff4eaa46 100644
--- a/src/lib66/ssexec_init.c
+++ b/src/lib66/ssexec_init.c
@@ -106,7 +106,7 @@ int ssexec_init(int argc, char const *const *argv,char const *const *envp,ssexec
{
char *name = sasvc.s + i ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
if (!resolve_check(sares.s,name)) log_diesys(LOG_EXIT_USER,"unknown service: ",name) ;
if (!resolve_read(wres,sares.s,name)) log_dieusys(LOG_EXIT_SYS,"read resolve file of: ",name) ;
if (!service_resolve_add_deps(&gares,&res,sares.s)) log_dieusys(LOG_EXIT_SYS,"resolve dependencies of: ",name) ;
@@ -151,7 +151,7 @@ int ssexec_init(int argc, char const *const *argv,char const *const *envp,ssexec
stralloc_free(&sares) ;
stralloc_free(&sasvc) ;
- resolve_deep_free(SERVICE_STRUCT, &gares) ;
+ resolve_deep_free(DATA_SERVICE, &gares) ;
/** db already initiated? */
if (db)
diff --git a/src/lib66/ssexec_start.c b/src/lib66/ssexec_start.c
index b4113321..61497fa6 100644
--- a/src/lib66/ssexec_start.c
+++ b/src/lib66/ssexec_start.c
@@ -220,7 +220,7 @@ int ssexec_start(int argc, char const *const *argv,char const *const *envp,ssexe
genalloc gares = GENALLOC_ZERO ; //resolve_service_t
resolve_service_t_ref pres ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
ss_state_t sta = STATE_ZERO ;
cl = rc = logname = 0 ;
@@ -279,7 +279,7 @@ int ssexec_start(int argc, char const *const *argv,char const *const *envp,ssexe
int reload = 0 ;
int reverse = 0 ;
pres = &genalloc_s(resolve_service_t,&gares)[i] ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, pres) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, pres) ;
char *string = pres->sa.s ;
char *name = string + pres->name ;
logname = 0 ;
@@ -296,7 +296,7 @@ int ssexec_start(int argc, char const *const *argv,char const *const *envp,ssexe
log_die(LOG_EXIT_USER,"service: ",name," was disabled, you can only stop it") ;
logname = get_rstrlen_until(name,SS_LOG_SUFFIX) ;
- if (logname > 0 && (!resolve_cmp(&gares, string + pres->logassoc, SERVICE_STRUCT)))
+ if (logname > 0 && (!resolve_cmp(&gares, string + pres->logassoc, DATA_SERVICE)))
{
if (RELOAD > 1) log_die(LOG_EXIT_SYS,"-R signal is not allowed to a logger") ;
if (sta.init) reverse = 1 ;
@@ -364,7 +364,7 @@ int ssexec_start(int argc, char const *const *argv,char const *const *envp,ssexe
if (!svc_switch_to(info,SS_SWSRC))
log_dieu(LOG_EXIT_SYS,"switch classic service list of: ",info->treename.s," to source") ;
- resolve_deep_free(SERVICE_STRUCT, &nclassic) ;
+ resolve_deep_free(DATA_SERVICE, &nclassic) ;
}
if (rc)
{
@@ -380,11 +380,11 @@ int ssexec_start(int argc, char const *const *argv,char const *const *envp,ssexe
if (!db_switch_to(info,envp,SS_SWSRC))
log_dieu(LOG_EXIT_SYS,"switch atomic services list of: ",info->treename.s," to source") ;
}
- resolve_deep_free(SERVICE_STRUCT, &nrc) ;
+ resolve_deep_free(DATA_SERVICE, &nrc) ;
}
stralloc_free(&sares) ;
stralloc_free(&sasta) ;
- resolve_deep_free(SERVICE_STRUCT, &gares) ;
+ resolve_deep_free(DATA_SERVICE, &gares) ;
resolve_free(wres) ;
return 0 ;
diff --git a/src/lib66/ssexec_stop.c b/src/lib66/ssexec_stop.c
index 66381ed7..27743fe8 100644
--- a/src/lib66/ssexec_stop.c
+++ b/src/lib66/ssexec_stop.c
@@ -129,7 +129,7 @@ int ssexec_stop(int argc, char const *const *argv,char const *const *envp,ssexec
genalloc gares = GENALLOC_ZERO ; //resolve_service_t
resolve_service_t_ref pres ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
ss_state_t sta = STATE_ZERO ;
cl = rc = sigopt = 0 ;
@@ -192,12 +192,12 @@ int ssexec_stop(int argc, char const *const *argv,char const *const *envp,ssexec
if (obstr_equal(name,SS_MASTER + 1))
{
- if (pres->ndeps) goto append ;
+ if (pres->ndepends) goto append ;
else continue ;
}
/** logger cannot be unsupervised alone */
- if (logname > 0 && (!resolve_cmp(&gares,string + pres->logassoc, SERVICE_STRUCT)))
+ if (logname > 0 && (!resolve_cmp(&gares,string + pres->logassoc, DATA_SERVICE)))
{
if (UNSUP) log_die(LOG_EXIT_SYS,"logger detected - unsupervise request is not allowed") ;
}
@@ -263,7 +263,7 @@ int ssexec_stop(int argc, char const *const *argv,char const *const *envp,ssexec
}
stralloc_free(&sares) ;
resolve_free(wres) ;
- resolve_deep_free(SERVICE_STRUCT, &gares) ;
+ resolve_deep_free(DATA_SERVICE, &gares) ;
return 0 ;
}
diff --git a/src/lib66/ssexec_svctl.c b/src/lib66/ssexec_svctl.c
index d4d3ad7b..c1039c24 100644
--- a/src/lib66/ssexec_svctl.c
+++ b/src/lib66/ssexec_svctl.c
@@ -499,7 +499,7 @@ int ssexec_svctl(int argc, char const *const *argv,char const *const *envp,ssexe
stralloc sares = STRALLOC_ZERO ;
ss_resolve_graph_t graph = RESOLVE_GRAPH_ZERO ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
ss_state_t sta = STATE_ZERO ;
char *sig = 0 ;
diff --git a/src/lib66/utils.c b/src/lib66/utils.c
index 25791d97..838781a6 100644
--- a/src/lib66/utils.c
+++ b/src/lib66/utils.c
@@ -332,7 +332,7 @@ int module_in_cmdline(genalloc *gares, resolve_service_t *res, char const *dir)
int e = 0 ;
stralloc tmp = STRALLOC_ZERO ;
size_t pos = 0 ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, res) ;
if (!resolve_append(gares,wres)) goto err ;
@@ -347,7 +347,7 @@ int module_in_cmdline(genalloc *gares, resolve_service_t *res, char const *dir)
if (!resolve_check(dir,name)) goto err ;
if (!resolve_read(wres,dir,name)) goto err ;
if (res->type == TYPE_CLASSIC)
- if (resolve_search(gares,name, SERVICE_STRUCT) < 0)
+ if (resolve_search(gares,name, DATA_SERVICE) < 0)
if (!resolve_append(gares,wres)) goto err ;
}
@@ -368,7 +368,7 @@ int module_search_service(char const *src, genalloc *gares, char const *name,uin
stralloc list = STRALLOC_ZERO ;
stralloc tmp = STRALLOC_ZERO ;
resolve_service_t res = RESOLVE_SERVICE_ZERO ;
- resolve_wrapper_t_ref wres = resolve_set_struct(SERVICE_STRUCT, &res) ;
+ resolve_wrapper_t_ref wres = resolve_set_struct(DATA_SERVICE, &res) ;
char const *exclude[2] = { SS_MASTER + 1, 0 } ;
char t[srclen + SS_RESOLVE_LEN + 1] ;
--
GitLab