Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
6
66
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eric Vidal
66
Commits
5a262202
Commit
5a262202
authored
3 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
rename service_resolve_write_master to service_resolve_master_write
parent
5071faca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/include/66/service.h
+2
-2
2 additions, 2 deletions
src/include/66/service.h
src/lib66/service.c
+2
-2
2 additions, 2 deletions
src/lib66/service.c
src/lib66/ssexec_disable.c
+1
-1
1 addition, 1 deletion
src/lib66/ssexec_disable.c
src/lib66/ssexec_enable.c
+1
-1
1 addition, 1 deletion
src/lib66/ssexec_enable.c
with
6 additions
and
6 deletions
src/include/66/service.h
+
2
−
2
View file @
5a262202
...
...
@@ -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_mas
te
r
(
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_crea
te
(
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
)
;
/**
...
...
This diff is collapsed.
Click to expand it.
src/lib66/service.c
+
2
−
2
View file @
5a262202
...
...
@@ -1815,7 +1815,7 @@ int service_resolve_add_logger(genalloc *ga,char const *src)
return
e
;
}
int
service_resolve_
create_mas
te
r
(
char
const
*
base
,
char
const
*
treename
)
int
service_resolve_
master_crea
te
(
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
()
;
...
...
This diff is collapsed.
Click to expand it.
src/lib66/ssexec_disable.c
+
1
−
1
View file @
5a262202
...
...
@@ -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
)
;
...
...
This diff is collapsed.
Click to expand it.
src/lib66/ssexec_enable.c
+
1
−
1
View file @
5a262202
...
...
@@ -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
)
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment