Skip to content
Snippets Groups Projects
Commit d4338741 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

nothing to see

parent 5d10db4b
No related branches found
No related tags found
No related merge requests found
![GitLabl Build Status](https://framagit.org/Obarun/66/badges/master/pipeline.svg) ![GitLabl Build Status](https://git.obarun.org/Obarun/66/badges/master/pipeline.svg)
66 - Helpers tools around S6 supervision suite 66 - Helpers tools around S6 supervision suite
=== ===
......
...@@ -151,7 +151,7 @@ static void info_display_depends(char const *field, char const *treename) ...@@ -151,7 +151,7 @@ static void info_display_depends(char const *field, char const *treename)
if (NOFIELD) padding = info_display_field_name(field) ; if (NOFIELD) padding = info_display_field_name(field) ;
else { field = 0 ; padding = 0 ; } else { field = 0 ; padding = 0 ; }
graph_build_tree(&graph, base.s) ; graph_build_tree(&graph, base.s, E_RESOLVE_TREE_MASTER_CONTENTS) ;
r = graph_matrix_get_edge_g_sorted_sa(&sa, &graph, treename, 0, 0) ; r = graph_matrix_get_edge_g_sorted_sa(&sa, &graph, treename, 0, 0) ;
if (r < 0) if (r < 0)
...@@ -211,7 +211,7 @@ static void info_display_requiredby(char const *field, char const *treename) ...@@ -211,7 +211,7 @@ static void info_display_requiredby(char const *field, char const *treename)
if (NOFIELD) padding = info_display_field_name(field) ; if (NOFIELD) padding = info_display_field_name(field) ;
else { field = 0 ; padding = 0 ; } else { field = 0 ; padding = 0 ; }
graph_build_tree(&graph, base.s) ; graph_build_tree(&graph, base.s, E_RESOLVE_TREE_MASTER_CONTENTS) ;
r = graph_matrix_get_edge_g_sorted_sa(&sa, &graph, treename, 1, 0) ; r = graph_matrix_get_edge_g_sorted_sa(&sa, &graph, treename, 1, 0) ;
if (r < 0) if (r < 0)
......
...@@ -307,7 +307,7 @@ static void tree_parse_options_depends(graph_t *g, ssexec_t *info, char const *s ...@@ -307,7 +307,7 @@ static void tree_parse_options_depends(graph_t *g, ssexec_t *info, char const *s
newinfo.help = info->help ; newinfo.help = info->help ;
newinfo.usage = info->usage ; newinfo.usage = info->usage ;
newinfo.opt_color = info->opt_color ; newinfo.opt_color = info->opt_color ;
newinfo.skip_opt_tree = info->skip_opt_tree ; newinfo.opt_tree = info->opt_tree ;
int nwhat = what->noseed ? 2 : 0 ; int nwhat = what->noseed ? 2 : 0 ;
...@@ -325,7 +325,7 @@ static void tree_parse_options_depends(graph_t *g, ssexec_t *info, char const *s ...@@ -325,7 +325,7 @@ static void tree_parse_options_depends(graph_t *g, ssexec_t *info, char const *s
newargv[m++] = name ; newargv[m++] = name ;
newargv[m++] = 0 ; newargv[m++] = 0 ;
log_trace("launch 66-tree sub-process for tree: ", name) ; log_trace("launch 66 tree sub-process for tree: ", name) ;
PROG = "tree" ; PROG = "tree" ;
if (ssexec_tree(nargc, newargv, &newinfo)) if (ssexec_tree(nargc, newargv, &newinfo))
...@@ -1358,7 +1358,7 @@ int ssexec_tree(int argc, char const *const *argv, ssexec_t *info) ...@@ -1358,7 +1358,7 @@ int ssexec_tree(int argc, char const *const *argv, ssexec_t *info)
if (!r && what.remove) if (!r && what.remove)
log_dieusys(LOG_EXIT_SYS,"find tree: ", info->treename.s) ; log_dieusys(LOG_EXIT_SYS,"find tree: ", info->treename.s) ;
graph_build_tree(&graph, info->base.s) ; graph_build_tree(&graph, info->base.s, E_RESOLVE_TREE_MASTER_CONTENTS) ;
if (what.remove) { if (what.remove) {
tree_remove(&graph, info->base.s, info->treename.s) ; tree_remove(&graph, info->base.s, info->treename.s) ;
......
...@@ -30,5 +30,5 @@ void graph_build_g(graph_t *graph, resolve_service_t *ares, unsigned int *aresle ...@@ -30,5 +30,5 @@ void graph_build_g(graph_t *graph, resolve_service_t *ares, unsigned int *aresle
else if (data_type == DATA_TREE) else if (data_type == DATA_TREE)
graph_build_tree(g, info->base.s) ; graph_build_tree(g, info->base.s, E_RESOLVE_TREE_MASTER_CONTENTS) ;
} }
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <66/tree.h> #include <66/tree.h>
#include <66/graph.h> #include <66/graph.h>
void graph_build_tree(graph_t *g, char const *base) void graph_build_tree(graph_t *g, char const *base, resolve_tree_master_enum_t field)
{ {
log_flow() ; log_flow() ;
...@@ -37,7 +37,7 @@ void graph_build_tree(graph_t *g, char const *base) ...@@ -37,7 +37,7 @@ void graph_build_tree(graph_t *g, char const *base)
resolve_tree_t tres = RESOLVE_TREE_ZERO ; resolve_tree_t tres = RESOLVE_TREE_ZERO ;
resolve_wrapper_t_ref wres = resolve_set_struct(DATA_TREE, &tres) ; resolve_wrapper_t_ref wres = resolve_set_struct(DATA_TREE, &tres) ;
if (!resolve_get_field_tosa_g(&sa, base, SS_MASTER + 1, DATA_TREE_MASTER, E_RESOLVE_TREE_MASTER_CONTENTS)) if (!resolve_get_field_tosa_g(&sa, base, SS_MASTER + 1, DATA_TREE_MASTER, field))
log_dieu(LOG_EXIT_SYS, "get resolve Master file of trees") ; log_dieu(LOG_EXIT_SYS, "get resolve Master file of trees") ;
FOREACH_SASTR(&sa, pos) { FOREACH_SASTR(&sa, pos) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment