Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
57017714
Unverified
Commit
57017714
authored
Feb 09, 2019
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
coccinelle: use standard exit identifiers
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
51a8a74c
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
55 additions
and
39 deletions
+55
-39
exit.cocci
coccinelle/exit.cocci
+16
-0
attach.c
src/lxc/attach.c
+1
-1
lxc_init.c
src/lxc/cmd/lxc_init.c
+2
-2
nbd.c
src/lxc/storage/nbd.c
+6
-6
arguments.c
src/lxc/tools/arguments.c
+2
-2
lxc_autostart.c
src/lxc/tools/lxc_autostart.c
+1
-1
aa.c
src/tests/aa.c
+3
-3
cgpath.c
src/tests/cgpath.c
+1
-1
list.c
src/tests/list.c
+1
-1
locktests.c
src/tests/locktests.c
+16
-16
may_control.c
src/tests/may_control.c
+1
-1
snapshot.c
src/tests/snapshot.c
+3
-3
startone.c
src/tests/startone.c
+2
-2
No files found.
coccinelle/exit.cocci
0 → 100644
View file @
57017714
@@
@@
- exit(0);
+ exit(EXIT_SUCCESS);
@@
@@
- _exit(0);
+ _exit(EXIT_SUCCESS);
@@
@@
- exit(1);
+ exit(EXIT_FAILURE);
@@
@@
- _exit(1);
+ _exit(EXIT_FAILURE);
src/lxc/attach.c
View file @
57017714
...
...
@@ -1521,7 +1521,7 @@ int lxc_attach(const char *name, const char *lxcpath,
/* The rest is in the hands of the initial and the attached process. */
lxc_proc_put_context_info
(
init_ctx
);
_exit
(
0
);
_exit
(
EXIT_SUCCESS
);
}
int
lxc_attach_run_command
(
void
*
payload
)
...
...
src/lxc/cmd/lxc_init.c
View file @
57017714
...
...
@@ -459,13 +459,13 @@ __noreturn static void print_usage_exit(const struct option longopts[])
{
fprintf
(
stderr
,
"Usage: lxc-init [-n|--name=NAME] [-h|--help] [--usage] [--version]
\n
\
[-q|--quiet] [-P|--lxcpath=LXCPATH]
\n
"
);
exit
(
0
);
exit
(
EXIT_SUCCESS
);
}
__noreturn
static
void
print_version_exit
(
void
)
{
printf
(
"%s
\n
"
,
LXC_VERSION
);
exit
(
0
);
exit
(
EXIT_SUCCESS
);
}
static
void
print_help
(
void
)
...
...
src/lxc/storage/nbd.c
View file @
57017714
...
...
@@ -208,13 +208,13 @@ static int do_attach_nbd(void *d)
if
(
sigprocmask
(
SIG_BLOCK
,
&
mask
,
NULL
)
==
-
1
)
{
SYSERROR
(
"Error blocking signals for nbd watcher"
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
sfd
=
signalfd
(
-
1
,
&
mask
,
0
);
if
(
sfd
==
-
1
)
{
SYSERROR
(
"Error opening signalfd for nbd task"
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
if
(
prctl
(
PR_SET_PDEATHSIG
,
prctl_arg
(
SIGHUP
),
prctl_arg
(
0
),
...
...
@@ -231,7 +231,7 @@ static int do_attach_nbd(void *d)
if
(
fdsi
.
ssi_signo
==
SIGHUP
)
{
/* container has exited */
nbd_detach
(
nbd
);
exit
(
0
);
exit
(
EXIT_SUCCESS
);
}
else
if
(
fdsi
.
ssi_signo
==
SIGCHLD
)
{
int
status
;
...
...
@@ -241,7 +241,7 @@ static int do_attach_nbd(void *d)
if
((
WIFEXITED
(
status
)
&&
WEXITSTATUS
(
status
)
!=
0
)
||
WIFSIGNALED
(
status
))
{
nbd_detach
(
nbd
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
}
}
...
...
@@ -255,7 +255,7 @@ static int do_attach_nbd(void *d)
execlp
(
"qemu-nbd"
,
"qemu-nbd"
,
"-c"
,
nbd
,
path
,
(
char
*
)
NULL
);
SYSERROR
(
"Error executing qemu-nbd"
);
_exit
(
1
);
_exit
(
EXIT_FAILURE
);
}
static
bool
clone_attach_nbd
(
const
char
*
nbd
,
const
char
*
path
)
...
...
@@ -304,7 +304,7 @@ static void nbd_detach(const char *path)
execlp
(
"qemu-nbd"
,
"qemu-nbd"
,
"-d"
,
path
,
(
char
*
)
NULL
);
SYSERROR
(
"Error executing qemu-nbd"
);
_exit
(
1
);
_exit
(
EXIT_FAILURE
);
}
/*
...
...
src/lxc/tools/arguments.c
View file @
57017714
...
...
@@ -135,13 +135,13 @@ __noreturn static void print_usage_exit(const struct option longopts[],
}
fprintf
(
stderr
,
"
\n
"
);
exit
(
0
);
exit
(
EXIT_SUCCESS
);
}
__noreturn
static
void
print_version_exit
()
{
printf
(
"%s
\n
"
,
lxc_get_version
());
exit
(
0
);
exit
(
EXIT_SUCCESS
);
}
__noreturn
static
void
print_help_exit
(
const
struct
lxc_arguments
*
args
,
...
...
src/lxc/tools/lxc_autostart.c
View file @
57017714
...
...
@@ -512,7 +512,7 @@ int main(int argc, char *argv[])
free
(
containers
);
if
(
failed
==
count
)
exit
(
1
);
/* Total failure */
exit
(
EXIT_FAILURE
);
/* Total failure */
else
if
(
failed
>
0
)
exit
(
2
);
/* Partial failure */
...
...
src/tests/aa.c
View file @
57017714
...
...
@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
c
=
lxc_container_new
(
MYNAME
,
NULL
);
if
(
!
c
)
{
fprintf
(
stderr
,
"%s: %d: failed to load first container
\n
"
,
__FILE__
,
__LINE__
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
if
(
c
->
is_defined
(
c
))
{
...
...
@@ -190,9 +190,9 @@ int main(int argc, char *argv[])
c
->
stop
(
c
);
try_to_remove
();
exit
(
0
);
exit
(
EXIT_SUCCESS
);
err:
try_to_remove
();
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
src/tests/cgpath.c
View file @
57017714
...
...
@@ -184,7 +184,7 @@ int main()
* pam_cgroup */
if
(
geteuid
()
!=
0
)
{
TSTERR
(
"requires privilege"
);
exit
(
0
);
exit
(
EXIT_SUCCESS
);
}
#if TEST_ALREADY_RUNNING_CT
...
...
src/tests/list.c
View file @
57017714
...
...
@@ -99,5 +99,5 @@ int main(int argc, char *argv[])
test_list_func
(
lxcpath
,
"Active:"
,
list_active_containers
);
test_list_func
(
lxcpath
,
"All:"
,
list_all_containers
);
exit
(
0
);
exit
(
EXIT_SUCCESS
);
}
src/tests/locktests.c
View file @
57017714
...
...
@@ -37,46 +37,46 @@ static void test_two_locks(void)
char
c
;
if
(
pipe
(
p
)
<
0
)
exit
(
1
);
exit
(
EXIT_FAILURE
);
if
((
pid
=
fork
())
<
0
)
exit
(
1
);
exit
(
EXIT_FAILURE
);
if
(
pid
==
0
)
{
if
(
read
(
p
[
0
],
&
c
,
1
)
<
0
)
{
perror
(
"read"
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
l
=
lxc_newlock
(
"/tmp"
,
"lxctest-sem"
);
if
(
!
l
)
{
fprintf
(
stderr
,
"%d: child: failed to create lock
\n
"
,
__LINE__
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
if
(
lxclock
(
l
,
0
)
<
0
)
{
fprintf
(
stderr
,
"%d: child: failed to grab lock
\n
"
,
__LINE__
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
fprintf
(
stderr
,
"%d: child: grabbed lock
\n
"
,
__LINE__
);
exit
(
0
);
exit
(
EXIT_SUCCESS
);
}
l
=
lxc_newlock
(
"/tmp"
,
"lxctest-sem"
);
if
(
!
l
)
{
fprintf
(
stderr
,
"%d: failed to create lock
\n
"
,
__LINE__
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
if
(
lxclock
(
l
,
0
)
<
0
)
{
fprintf
(
stderr
,
"%d; failed to get lock
\n
"
,
__LINE__
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
if
(
write
(
p
[
1
],
"a"
,
1
)
<
0
)
{
perror
(
"write"
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
sleep
(
3
);
...
...
@@ -87,13 +87,13 @@ static void test_two_locks(void)
printf
(
"%d exited normally with exit code %d
\n
"
,
pid
,
WEXITSTATUS
(
status
));
if
(
WEXITSTATUS
(
status
)
!=
0
)
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
else
printf
(
"%d did not exit normally
\n
"
,
pid
);
return
;
}
else
if
(
ret
<
0
)
{
perror
(
"waitpid"
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
kill
(
pid
,
SIGKILL
);
...
...
@@ -112,26 +112,26 @@ int main(int argc, char *argv[])
lock
=
lxc_newlock
(
NULL
,
NULL
);
if
(
!
lock
)
{
fprintf
(
stderr
,
"%d: failed to get unnamed lock
\n
"
,
__LINE__
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
ret
=
lxclock
(
lock
,
0
);
if
(
ret
)
{
fprintf
(
stderr
,
"%d: failed to take unnamed lock (%d)
\n
"
,
__LINE__
,
ret
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
ret
=
lxcunlock
(
lock
);
if
(
ret
)
{
fprintf
(
stderr
,
"%d: failed to put unnamed lock (%d)
\n
"
,
__LINE__
,
ret
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
lxc_putlock
(
lock
);
lock
=
lxc_newlock
(
"/var/lib/lxc"
,
mycontainername
);
if
(
!
lock
)
{
fprintf
(
stderr
,
"%d: failed to get lock
\n
"
,
__LINE__
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
struct
stat
sb
;
...
...
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"%d: filename %s not created
\n
"
,
__LINE__
,
pathname
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
lxc_putlock
(
lock
);
...
...
src/tests/may_control.c
View file @
57017714
...
...
@@ -24,7 +24,7 @@
static
void
usage
(
const
char
*
me
)
{
printf
(
"Usage: %s name [lxcpath]
\n
"
,
me
);
exit
(
0
);
exit
(
EXIT_SUCCESS
);
}
int
main
(
int
argc
,
char
*
argv
[])
...
...
src/tests/snapshot.c
View file @
57017714
...
...
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
c
=
lxc_container_new
(
MYNAME
,
NULL
);
if
(
!
c
)
{
fprintf
(
stderr
,
"%s: %d: failed to load first container
\n
"
,
__FILE__
,
__LINE__
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
if
(
c
->
is_defined
(
c
))
{
...
...
@@ -188,12 +188,12 @@ good:
try_to_remove
();
printf
(
"All tests passed
\n
"
);
exit
(
0
);
exit
(
EXIT_SUCCESS
);
err:
lxc_container_put
(
c
);
try_to_remove
();
fprintf
(
stderr
,
"Exiting on error
\n
"
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
src/tests/startone.c
View file @
57017714
...
...
@@ -170,13 +170,13 @@ int main(int argc, char *argv[])
if
(
!
lxc_container_get
(
c
))
{
fprintf
(
stderr
,
"%d: failed to get extra ref to container
\n
"
,
__LINE__
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
c
->
want_daemonize
(
c
,
true
);
if
(
!
c
->
startl
(
c
,
0
,
NULL
))
{
fprintf
(
stderr
,
"%d: %s failed to start
\n
"
,
__LINE__
,
c
->
name
);
exit
(
1
);
exit
(
EXIT_FAILURE
);
}
sleep
(
3
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment