]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
tree-wide: fix compilation with-Wstrict-prototypes -Wold-style-definition 3631/head
authorChristian Brauner <christian.brauner@ubuntu.com>
Sun, 24 Jan 2021 21:19:34 +0000 (22:19 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Sun, 24 Jan 2021 21:19:34 +0000 (22:19 +0100)
Fixes: #3630
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/log.c
src/lxc/lsm/apparmor.c
src/lxc/tools/arguments.c
src/lxc/tools/lxc_copy.c
src/lxc/utils.c
src/tests/cgpath.c
src/tests/lxcpath.c
src/tests/mount_injection.c

index 824c3f5fa6ae32d26e538a95ee31396dcf68ba8b..6c75744534e177a5c6baae955b6727657a419ae2 100644 (file)
@@ -82,7 +82,7 @@ static int lxc_log_priority_to_syslog(int priority)
        return LOG_NOTICE;
 }
 
-static const char *lxc_log_get_container_name()
+static const char *lxc_log_get_container_name(void)
 {
 #ifndef NO_LXC_CONF
        if (current_config && !log_vmname)
@@ -814,7 +814,7 @@ inline const char *lxc_log_get_prefix(void)
        return log_prefix;
 }
 
-inline void lxc_log_options_no_override()
+inline void lxc_log_options_no_override(void)
 {
        lxc_quiet_specified = 1;
        lxc_loglevel_specified = 1;
index 21945b8266b1c9c88a993707f8ab63d45a26aa4c..ec946ad18444fd7e8dc957fce69bb2788c5d5005 100644 (file)
@@ -588,7 +588,7 @@ static bool file_is_yes(const char *path)
        return rd >= 4 && strncmp(buf, "yes\n", 4) == 0;
 }
 
-static bool apparmor_can_stack()
+static bool apparmor_can_stack(void)
 {
        int major, minor, scanned;
        FILE *f;
index dfed2a9ab91fcaf137d30b641850ef66f0f01b9d..447031fc02add2b8f104679205c9bb65a6227ca7 100644 (file)
@@ -116,7 +116,7 @@ __noreturn static void print_usage_exit(const struct option longopts[],
        exit(EXIT_SUCCESS);
 }
 
-__noreturn static void print_version_exit()
+__noreturn static void print_version_exit(void)
 {
        printf("%s\n", lxc_get_version());
        exit(EXIT_SUCCESS);
index db26094ad5797e266b5ebe1d6a38a77b87d66af5..c406929272764fb00e8541b7d130be482f5a597e 100644 (file)
@@ -509,7 +509,7 @@ static int do_clone_task(struct lxc_container *c, enum task task, int flags,
        return ret;
 }
 
-static void free_mnts()
+static void free_mnts(void)
 {
        unsigned int i;
        struct mnts *n = NULL;
index 1e0b38e121b63f2da4ef9cf965124cb294b6cc05..bb7074cca6e54f001f77eeabd7ebec95334d533b 100644 (file)
@@ -238,7 +238,7 @@ int mkdir_p(const char *dir, mode_t mode)
        return 0;
 }
 
-char *get_rundir()
+char *get_rundir(void)
 {
        __do_free char *rundir = NULL;
        char *static_rundir;
index 5a7d6839c4eff43c094621f36d1c45b9b916b695..5e3eb56c336940083071edab523e80bd6b582df6 100644 (file)
@@ -173,7 +173,7 @@ out1:
        return ret;
 }
 
-int main()
+int main(int argc, char *argv[])
 {
        int ret = EXIT_FAILURE;
 
index b5141b46446950671c5159c8ecb026cd40559a26..64cc57b64dc698fa19a03962f14f761961f64fc1 100644 (file)
@@ -33,7 +33,7 @@
        fprintf(stderr, "%d: %s\n", __LINE__, x); \
 } while (0)
 
-int main()
+int main(int argc, char *argv[])
 {
        struct lxc_container *c;
        const char *p1, *p2;
index 3c44d4014f11c1d40c9315cc75501630e5253233..c054558800955df342f76ed9a5b4eb836ddc6c60 100644 (file)
@@ -371,13 +371,13 @@ out:
        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};
        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[] = {
                "lxc.mount.auto", "shmounts:/tmp/mount_injection_test",