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
4fc3bbd4
Unverified
Commit
4fc3bbd4
authored
Jan 24, 2021
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tree-wide: fix compilation with-Wstrict-prototypes -Wold-style-definition
Fixes: #3630 Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
132024c5
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
10 deletions
+10
-10
log.c
src/lxc/log.c
+2
-2
apparmor.c
src/lxc/lsm/apparmor.c
+1
-1
arguments.c
src/lxc/tools/arguments.c
+1
-1
lxc_copy.c
src/lxc/tools/lxc_copy.c
+1
-1
utils.c
src/lxc/utils.c
+1
-1
cgpath.c
src/tests/cgpath.c
+1
-1
lxcpath.c
src/tests/lxcpath.c
+1
-1
mount_injection.c
src/tests/mount_injection.c
+2
-2
No files found.
src/lxc/log.c
View file @
4fc3bbd4
...
@@ -82,7 +82,7 @@ static int lxc_log_priority_to_syslog(int priority)
...
@@ -82,7 +82,7 @@ static int lxc_log_priority_to_syslog(int priority)
return
LOG_NOTICE
;
return
LOG_NOTICE
;
}
}
static
const
char
*
lxc_log_get_container_name
()
static
const
char
*
lxc_log_get_container_name
(
void
)
{
{
#ifndef NO_LXC_CONF
#ifndef NO_LXC_CONF
if
(
current_config
&&
!
log_vmname
)
if
(
current_config
&&
!
log_vmname
)
...
@@ -814,7 +814,7 @@ inline const char *lxc_log_get_prefix(void)
...
@@ -814,7 +814,7 @@ inline const char *lxc_log_get_prefix(void)
return
log_prefix
;
return
log_prefix
;
}
}
inline
void
lxc_log_options_no_override
()
inline
void
lxc_log_options_no_override
(
void
)
{
{
lxc_quiet_specified
=
1
;
lxc_quiet_specified
=
1
;
lxc_loglevel_specified
=
1
;
lxc_loglevel_specified
=
1
;
...
...
src/lxc/lsm/apparmor.c
View file @
4fc3bbd4
...
@@ -588,7 +588,7 @@ static bool file_is_yes(const char *path)
...
@@ -588,7 +588,7 @@ static bool file_is_yes(const char *path)
return
rd
>=
4
&&
strncmp
(
buf
,
"yes
\n
"
,
4
)
==
0
;
return
rd
>=
4
&&
strncmp
(
buf
,
"yes
\n
"
,
4
)
==
0
;
}
}
static
bool
apparmor_can_stack
()
static
bool
apparmor_can_stack
(
void
)
{
{
int
major
,
minor
,
scanned
;
int
major
,
minor
,
scanned
;
FILE
*
f
;
FILE
*
f
;
...
...
src/lxc/tools/arguments.c
View file @
4fc3bbd4
...
@@ -116,7 +116,7 @@ __noreturn static void print_usage_exit(const struct option longopts[],
...
@@ -116,7 +116,7 @@ __noreturn static void print_usage_exit(const struct option longopts[],
exit
(
EXIT_SUCCESS
);
exit
(
EXIT_SUCCESS
);
}
}
__noreturn
static
void
print_version_exit
()
__noreturn
static
void
print_version_exit
(
void
)
{
{
printf
(
"%s
\n
"
,
lxc_get_version
());
printf
(
"%s
\n
"
,
lxc_get_version
());
exit
(
EXIT_SUCCESS
);
exit
(
EXIT_SUCCESS
);
...
...
src/lxc/tools/lxc_copy.c
View file @
4fc3bbd4
...
@@ -509,7 +509,7 @@ static int do_clone_task(struct lxc_container *c, enum task task, int flags,
...
@@ -509,7 +509,7 @@ static int do_clone_task(struct lxc_container *c, enum task task, int flags,
return
ret
;
return
ret
;
}
}
static
void
free_mnts
()
static
void
free_mnts
(
void
)
{
{
unsigned
int
i
;
unsigned
int
i
;
struct
mnts
*
n
=
NULL
;
struct
mnts
*
n
=
NULL
;
...
...
src/lxc/utils.c
View file @
4fc3bbd4
...
@@ -238,7 +238,7 @@ int mkdir_p(const char *dir, mode_t mode)
...
@@ -238,7 +238,7 @@ int mkdir_p(const char *dir, mode_t mode)
return
0
;
return
0
;
}
}
char
*
get_rundir
()
char
*
get_rundir
(
void
)
{
{
__do_free
char
*
rundir
=
NULL
;
__do_free
char
*
rundir
=
NULL
;
char
*
static_rundir
;
char
*
static_rundir
;
...
...
src/tests/cgpath.c
View file @
4fc3bbd4
...
@@ -173,7 +173,7 @@ out1:
...
@@ -173,7 +173,7 @@ out1:
return
ret
;
return
ret
;
}
}
int
main
()
int
main
(
int
argc
,
char
*
argv
[]
)
{
{
int
ret
=
EXIT_FAILURE
;
int
ret
=
EXIT_FAILURE
;
...
...
src/tests/lxcpath.c
View file @
4fc3bbd4
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
fprintf(stderr, "%d: %s\n", __LINE__, x); \
fprintf(stderr, "%d: %s\n", __LINE__, x); \
} while (0)
} while (0)
int
main
()
int
main
(
int
argc
,
char
*
argv
[]
)
{
{
struct
lxc_container
*
c
;
struct
lxc_container
*
c
;
const
char
*
p1
,
*
p2
;
const
char
*
p1
,
*
p2
;
...
...
src/tests/mount_injection.c
View file @
4fc3bbd4
...
@@ -371,13 +371,13 @@ out:
...
@@ -371,13 +371,13 @@ out:
return
ret
;
return
ret
;
}
}
static
int
do_priv_container_test
()
static
int
do_priv_container_test
(
void
)
{
{
const
char
*
config_items
[]
=
{
"lxc.mount.auto"
,
"shmounts:/tmp/mount_injection_test"
,
NULL
};
const
char
*
config_items
[]
=
{
"lxc.mount.auto"
,
"shmounts:/tmp/mount_injection_test"
,
NULL
};
return
perform_container_test
(
NAME
"privileged"
,
config_items
);
return
perform_container_test
(
NAME
"privileged"
,
config_items
);
}
}
static
int
do_unpriv_container_test
()
static
int
do_unpriv_container_test
(
void
)
{
{
const
char
*
config_items
[]
=
{
const
char
*
config_items
[]
=
{
"lxc.mount.auto"
,
"shmounts:/tmp/mount_injection_test"
,
"lxc.mount.auto"
,
"shmounts:/tmp/mount_injection_test"
,
...
...
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