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
fd5be714
Unverified
Commit
fd5be714
authored
Mar 15, 2020
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tree-wide: s/lxc_fini()/lxc_end()/g
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
0c5859ff
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
criu.c
src/lxc/criu.c
+2
-2
start.c
src/lxc/start.c
+2
-2
start.h
src/lxc/start.h
+1
-1
No files found.
src/lxc/criu.c
View file @
fd5be714
...
@@ -1135,7 +1135,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
...
@@ -1135,7 +1135,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
ret
=
lxc_poll
(
c
->
name
,
handler
);
ret
=
lxc_poll
(
c
->
name
,
handler
);
if
(
ret
)
if
(
ret
)
lxc_abort
(
handler
);
lxc_abort
(
handler
);
lxc_
fini
(
handler
);
lxc_
end
(
handler
);
_exit
(
ret
);
_exit
(
ret
);
}
}
...
@@ -1145,7 +1145,7 @@ out_fini_handler:
...
@@ -1145,7 +1145,7 @@ out_fini_handler:
if
(
pipes
[
1
]
>=
0
)
if
(
pipes
[
1
]
>=
0
)
close
(
pipes
[
1
]);
close
(
pipes
[
1
]);
lxc_
fini
(
handler
);
lxc_
end
(
handler
);
out:
out:
if
(
status_pipe
>=
0
)
{
if
(
status_pipe
>=
0
)
{
...
...
src/lxc/start.c
View file @
fd5be714
...
@@ -860,7 +860,7 @@ out_restore_sigmask:
...
@@ -860,7 +860,7 @@ out_restore_sigmask:
return
-
1
;
return
-
1
;
}
}
void
lxc_
fini
(
struct
lxc_handler
*
handler
)
void
lxc_
end
(
struct
lxc_handler
*
handler
)
{
{
int
ret
;
int
ret
;
pid_t
self
;
pid_t
self
;
...
@@ -2007,7 +2007,7 @@ __private_goto2:
...
@@ -2007,7 +2007,7 @@ __private_goto2:
detach_block_device
(
handler
->
conf
);
detach_block_device
(
handler
->
conf
);
__private_goto3:
__private_goto3:
lxc_
fini
(
handler
);
lxc_
end
(
handler
);
return
ret
;
return
ret
;
...
...
src/lxc/start.h
View file @
fd5be714
...
@@ -150,7 +150,7 @@ extern struct lxc_handler *lxc_init_handler(const char *name,
...
@@ -150,7 +150,7 @@ extern struct lxc_handler *lxc_init_handler(const char *name,
extern
void
lxc_zero_handler
(
struct
lxc_handler
*
handler
);
extern
void
lxc_zero_handler
(
struct
lxc_handler
*
handler
);
extern
void
lxc_free_handler
(
struct
lxc_handler
*
handler
);
extern
void
lxc_free_handler
(
struct
lxc_handler
*
handler
);
extern
int
lxc_init
(
const
char
*
name
,
struct
lxc_handler
*
handler
);
extern
int
lxc_init
(
const
char
*
name
,
struct
lxc_handler
*
handler
);
extern
void
lxc_
fini
(
struct
lxc_handler
*
handler
);
extern
void
lxc_
end
(
struct
lxc_handler
*
handler
);
/* lxc_check_inherited: Check for any open file descriptors and close them if
/* lxc_check_inherited: Check for any open file descriptors and close them if
* requested.
* requested.
...
...
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