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
85220f24
Commit
85220f24
authored
4 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
pass to new format of parse_service_before
parent
03548cb4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/lib66/ssexec_enable.c
+3
-6
3 additions, 6 deletions
src/lib66/ssexec_enable.c
with
3 additions
and
6 deletions
src/lib66/ssexec_enable.c
+
3
−
6
View file @
85220f24
...
...
@@ -15,7 +15,6 @@
#include
<string.h>
#include
<stdint.h>
#include
<errno.h>
#include
<stdio.h>
#include
<oblibs/obgetopt.h>
#include
<oblibs/log.h>
...
...
@@ -63,11 +62,11 @@ void start_parser(stralloc *list,ssexec_t *info, unsigned int *nbsv,uint8_t FORC
stralloc
sasv
=
STRALLOC_ZERO
;
stralloc
parsed_list
=
STRALLOC_ZERO
;
stralloc
tree_list
=
STRALLOC_ZERO
;
uint8_t
disable_module
=
1
;
for
(;
i
<
len
;
i
+=
strlen
(
list
->
s
+
i
)
+
1
)
{
char
*
name
=
list
->
s
+
i
;
if
(
!
parse_service_before
(
info
,
&
parsed_list
,
&
tree_list
,
name
,
nbsv
,
&
sasv
,
FORCE
,
CONF
))
if
(
!
parse_service_before
(
info
,
&
parsed_list
,
&
tree_list
,
name
,
nbsv
,
&
sasv
,
FORCE
,
CONF
,
disable_module
))
log_dieu
(
LOG_EXIT_SYS
,
"parse service file: "
,
name
,
": or its dependencies"
)
;
}
stralloc_free
(
&
sasv
)
;
...
...
@@ -83,7 +82,7 @@ void start_write(stralloc *tostart,unsigned int *nclassic,unsigned int *nlongrun
{
sv_alltype_ref
sv
=
&
genalloc_s
(
sv_alltype
,
gasv
)[
i
]
;
char
*
name
=
keep
.
s
+
sv
->
cname
.
name
;
r
=
write_services
(
sv
,
workdir
,
FORCE
,
CONF
)
;
if
(
!
r
)
log_dieu_nclean
(
LOG_EXIT_SYS
,
&
cleanup
,
"write service: "
,
name
)
;
...
...
@@ -115,7 +114,6 @@ int ssexec_enable(int argc, char const *const *argv,char const *const *envp,ssex
size_t
pos
=
0
;
unsigned
int
nbsv
,
nlongrun
,
nclassic
,
start
;
//stralloc home = STRALLOC_ZERO ;
stralloc
sasrc
=
STRALLOC_ZERO
;
stralloc
tostart
=
STRALLOC_ZERO
;
...
...
@@ -200,7 +198,6 @@ int ssexec_enable(int argc, char const *const *argv,char const *const *envp,ssex
/** parser allocation*/
freed_parser
()
;
/** inner allocation */
//stralloc_free(&home) ;
stralloc_free
(
&
workdir
)
;
stralloc_free
(
&
sasrc
)
;
...
...
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