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
b8ab4849
Unverified
Commit
b8ab4849
authored
Oct 19, 2018
by
Christian Brauner
Committed by
GitHub
Oct 19, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2703 from 2xsec/asan1
cleanups
parents
9de79b17
47903908
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
73 additions
and
25 deletions
+73
-25
commands.c
src/lxc/commands.c
+1
-1
commands_utils.c
src/lxc/commands_utils.c
+2
-2
confile.c
src/lxc/confile.c
+69
-20
monitor.c
src/lxc/monitor.c
+1
-1
raw_syscalls.c
src/lxc/raw_syscalls.c
+0
-1
No files found.
src/lxc/commands.c
View file @
b8ab4849
...
@@ -1212,7 +1212,7 @@ static int lxc_cmd_accept(int fd, uint32_t events, void *data,
...
@@ -1212,7 +1212,7 @@ static int lxc_cmd_accept(int fd, uint32_t events, void *data,
connection
=
accept
(
fd
,
NULL
,
0
);
connection
=
accept
(
fd
,
NULL
,
0
);
if
(
connection
<
0
)
{
if
(
connection
<
0
)
{
SYSERROR
(
"Failed to accept connection to run command
.
"
);
SYSERROR
(
"Failed to accept connection to run command"
);
return
LXC_MAINLOOP_ERROR
;
return
LXC_MAINLOOP_ERROR
;
}
}
...
...
src/lxc/commands_utils.c
View file @
b8ab4849
...
@@ -120,7 +120,7 @@ int lxc_make_abstract_socket_name(char *path, size_t pathlen,
...
@@ -120,7 +120,7 @@ int lxc_make_abstract_socket_name(char *path, size_t pathlen,
* Although null termination isn't required by the API, we do it anyway
* Although null termination isn't required by the API, we do it anyway
* because we print the sockname out sometimes.
* because we print the sockname out sometimes.
*/
*/
len
=
pathlen
-
2
;
len
=
pathlen
-
2
;
name
=
lxcname
;
name
=
lxcname
;
if
(
!
name
)
if
(
!
name
)
...
@@ -220,6 +220,6 @@ int lxc_add_state_client(int state_client_fd, struct lxc_handler *handler,
...
@@ -220,6 +220,6 @@ int lxc_add_state_client(int state_client_fd, struct lxc_handler *handler,
return
state
;
return
state
;
}
}
TRACE
(
"
a
dded state client %d to state client list"
,
state_client_fd
);
TRACE
(
"
A
dded state client %d to state client list"
,
state_client_fd
);
return
MAX_STATE
;
return
MAX_STATE
;
}
}
src/lxc/confile.c
View file @
b8ab4849
This diff is collapsed.
Click to expand it.
src/lxc/monitor.c
View file @
b8ab4849
...
@@ -79,7 +79,7 @@ int lxc_monitor_fifo_name(const char *lxcpath, char *fifo_path, size_t fifo_path
...
@@ -79,7 +79,7 @@ int lxc_monitor_fifo_name(const char *lxcpath, char *fifo_path, size_t fifo_path
}
}
ret
=
mkdir_p
(
fifo_path
,
0755
);
ret
=
mkdir_p
(
fifo_path
,
0755
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
ERROR
(
"Unable to create monitor fifo directory %s
.
"
,
fifo_path
);
ERROR
(
"Unable to create monitor fifo directory %s"
,
fifo_path
);
free
(
rundir
);
free
(
rundir
);
return
ret
;
return
ret
;
}
}
...
...
src/lxc/raw_syscalls.c
View file @
b8ab4849
...
@@ -34,7 +34,6 @@ int lxc_raw_execveat(int dirfd, const char *pathname, char *const argv[],
...
@@ -34,7 +34,6 @@ int lxc_raw_execveat(int dirfd, const char *pathname, char *const argv[],
*/
*/
pid_t
lxc_raw_clone
(
unsigned
long
flags
)
pid_t
lxc_raw_clone
(
unsigned
long
flags
)
{
{
/*
/*
* These flags don't interest at all so we don't jump through any hoopes
* These flags don't interest at all so we don't jump through any hoopes
* of retrieving them and passing them to the kernel.
* of retrieving them and passing them to the kernel.
...
...
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