github: Update for main branch

[mirror_lxc.git] / src / tests / mount_injection.c

diff --git a/src/tests/mount_injection.c b/src/tests/mount_injection.c
index 3c44d4014f11c1d40c9315cc75501630e5253233..59d23c8dd4cf179596da1ea949c755209b241d45 100644 (file)
--- a/src/tests/mount_injection.c
+++ b/src/tests/mount_injection.c
@@ -16,13 +16,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <lxc/lxccontainer.h>
-#include <lxc/list.h>
 #include <string.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
@@ -31,6 +31,7 @@
 
 #include "config.h"
 #include "lxctest.h"
+#include "list.h"
 #include "utils.h"
 
 #define NAME "mount_injection_test-"
@@ -371,13 +372,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",
@@ -390,7 +391,7 @@ static bool lxc_setup_shmount(const char *shmount_path)
 {
        int ret;
 
-       ret = mkdir_p(shmount_path, 0711);
+       ret = lxc_mkdir_p(shmount_path, 0711);
        if (ret < 0 && errno != EEXIST) {
                fprintf(stderr, "Failed to create directory \"%s\"\n", shmount_path);
                return false;