From 9d257a2a23f3c100c26881ff005e9cb5b9a02839 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 10 Mar 2018 23:40:59 +0100
Subject: [PATCH] conf: order includes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 src/lxc/conf.c | 69 +++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index cd99124f9..71e6be88f 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -24,38 +24,37 @@
 #define _GNU_SOURCE
 #include "config.h"
 
+#include <arpa/inet.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <inttypes.h>
 #include <libgen.h>
+#include <linux/loop.h>
+#include <net/if.h>
+#include <netinet/in.h>
 #include <pwd.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <linux/loop.h>
-#include <net/if.h>
-#include <netinet/in.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/param.h>
 #include <sys/prctl.h>
-#include <sys/stat.h>
 #include <sys/socket.h>
-#include <sys/sysmacros.h>
+#include <sys/stat.h>
 #include <sys/syscall.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
 
-/* makedev() */
 #ifdef MAJOR_IN_MKDEV
-#    include <sys/mkdev.h>
+#include <sys/mkdev.h>
 #endif
 
 #ifdef HAVE_STATVFS
@@ -68,8 +67,26 @@
 #include <../include/openpty.h>
 #endif
 
+#if HAVE_LIBCAP
+#include <sys/capability.h>
+#endif
+
+#if HAVE_SYS_PERSONALITY_H
+#include <sys/personality.h>
+#endif
+
+#if IS_BIONIC
+#include <../include/lxcmntent.h>
+#else
+#include <mntent.h>
+#endif
+
+#if !defined(HAVE_PRLIMIT) && defined(HAVE_PRLIMIT64)
+#include <../include/prlimit.h>
+#endif
+
 #include "af_unix.h"
-#include "caps.h"       /* for lxc_caps_last_cap() */
+#include "caps.h"
 #include "cgroup.h"
 #include "conf.h"
 #include "confile_utils.h"
@@ -88,29 +105,19 @@
 #include "terminal.h"
 #include "utils.h"
 
-#if HAVE_LIBCAP
-#include <sys/capability.h>
-#endif
-
-#if HAVE_SYS_PERSONALITY_H
-#include <sys/personality.h>
-#endif
-
-#if IS_BIONIC
-#include <../include/lxcmntent.h>
-#else
-#include <mntent.h>
+#ifndef MS_PRIVATE
+#define MS_PRIVATE (1<<18)
 #endif
 
-#if !defined(HAVE_PRLIMIT) && defined(HAVE_PRLIMIT64)
-#include <../include/prlimit.h>
+#ifndef MS_LAZYTIME
+#define MS_LAZYTIME (1<<25)
 #endif
 
 lxc_log_define(lxc_conf, lxc);
 
 /* Define pivot_root() if missing from the C library */
 #ifndef HAVE_PIVOT_ROOT
-static int pivot_root(const char * new_root, const char * put_old)
+static int pivot_root(const char *new_root, const char *put_old)
 {
 #ifdef __NR_pivot_root
 	return syscall(__NR_pivot_root, new_root, put_old);
@@ -120,15 +127,7 @@ static int pivot_root(const char * new_root, const char * put_old)
 #endif
 }
 #else
-extern int pivot_root(const char * new_root, const char * put_old);
-#endif
-
-#ifndef MS_PRIVATE
-#define MS_PRIVATE (1<<18)
-#endif
-
-#ifndef MS_LAZYTIME
-#define MS_LAZYTIME (1<<25)
+extern int pivot_root(const char *new_root, const char *put_old);
 #endif
 
 char *lxchook_names[NUM_LXC_HOOKS] = {"pre-start", "pre-mount", "mount",
-- 
2.47.2