From 5a262202098fa62c0ffd18b7e4d2ff45b2638cc5 Mon Sep 17 00:00:00 2001 From: obarun <eric@obarun.org> Date: Wed, 12 Jan 2022 19:06:09 +1100 Subject: [PATCH] rename service_resolve_write_master to service_resolve_master_write --- src/include/66/service.h | 4 ++-- src/lib66/service.c | 4 ++-- src/lib66/ssexec_disable.c | 2 +- src/lib66/ssexec_enable.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/include/66/service.h b/src/include/66/service.h index 396479bd..d4578bac 100644 --- a/src/include/66/service.h +++ b/src/include/66/service.h @@ -165,8 +165,8 @@ extern int service_resolve_copy(resolve_service_t *dst, resolve_service_t *res) extern int service_resolve_sort_bytype(stralloc *list, char const *src) ; extern int service_resolve_setnwrite(sv_alltype *services, ssexec_t *info, char const *dst) ; extern int service_resolve_setlognwrite(resolve_service_t *sv, char const *dst) ; -extern int service_resolve_create_master(char const *base, char const *treename) ; -extern int service_resolve_write_master(ssexec_t *info, ss_resolve_graph_t *graph, char const *dir, unsigned int reverse) ; +extern int service_resolve_master_create(char const *base, char const *treename) ; +extern int service_resolve_master_write(ssexec_t *info, ss_resolve_graph_t *graph, char const *dir, unsigned int reverse) ; extern int service_resolve_modify_field(resolve_service_t *res, resolve_service_enum_t field, char const *data) ; extern int service_resolve_field_tosa(stralloc *sa, resolve_service_t *res, resolve_service_enum_t field) ; /** diff --git a/src/lib66/service.c b/src/lib66/service.c index 8109da64..9b32c4d7 100644 --- a/src/lib66/service.c +++ b/src/lib66/service.c @@ -1815,7 +1815,7 @@ int service_resolve_add_logger(genalloc *ga,char const *src) return e ; } -int service_resolve_create_master(char const *base, char const *treename) +int service_resolve_master_create(char const *base, char const *treename) { int e = 0 ; size_t baselen = strlen(base), treelen = strlen(treename) ; @@ -1847,7 +1847,7 @@ int service_resolve_create_master(char const *base, char const *treename) return e ; } -int service_resolve_write_master(ssexec_t *info, ss_resolve_graph_t *graph,char const *dir, unsigned int reverse) +int service_resolve_master_write(ssexec_t *info, ss_resolve_graph_t *graph,char const *dir, unsigned int reverse) { log_flow() ; diff --git a/src/lib66/ssexec_disable.c b/src/lib66/ssexec_disable.c index 6a5c7019..e948c2fb 100644 --- a/src/lib66/ssexec_disable.c +++ b/src/lib66/ssexec_disable.c @@ -326,7 +326,7 @@ int ssexec_disable(int argc, char const *const *argv,char const *const *envp,sse if (r < 0) log_die(LOG_EXIT_USER,"cyclic graph detected") ; log_dieusys(LOG_EXIT_SYS,"publish service graph") ; } - if (!service_resolve_write_master(info,&graph,workdir.s,1)) + if (!service_resolve_master_write(info,&graph,workdir.s,1)) log_dieusys_nclean(LOG_EXIT_SYS,&cleanup,"update inner bundle") ; ss_resolve_graph_free(&graph) ; diff --git a/src/lib66/ssexec_enable.c b/src/lib66/ssexec_enable.c index c88fda1a..62af8f09 100644 --- a/src/lib66/ssexec_enable.c +++ b/src/lib66/ssexec_enable.c @@ -388,7 +388,7 @@ int ssexec_enable(int argc, char const *const *argv,char const *const *envp,ssex if (r < 0) log_die(LOG_EXIT_USER,"cyclic graph detected") ; log_dieusys(LOG_EXIT_SYS,"publish service graph") ; } - if (!service_resolve_write_master(info,&graph,workdir.s,0)) + if (!service_resolve_master_write(info,&graph,workdir.s,0)) log_dieusys_nclean(LOG_EXIT_SYS,&ssexec_enable_cleanup,"update inner bundle") ; ss_resolve_graph_free(&graph) ; -- GitLab