tree-wide: sort includes

Sort the includes accoding to the new coding style.
This commit is contained in:
Thomas Hindoe Paaboel Andersen
2015-11-16 22:09:36 +01:00
parent ab5dfda78f
commit cf0fbc49e6
205 changed files with 345 additions and 363 deletions
+3 -2
View File
@@ -21,16 +21,17 @@
#include <errno.h>
#include "audit-fd.h"
#ifdef HAVE_AUDIT
#include <stdbool.h>
#include <libaudit.h>
#include <stdbool.h>
#include "fd-util.h"
#include "log.h"
#include "util.h"
#include "fd-util.h"
static bool initialized = false;
static int audit_fd;
+1 -1
View File
@@ -21,8 +21,8 @@
#include "automount.h"
#include "bus-util.h"
#include "string-util.h"
#include "dbus-automount.h"
#include "string-util.h"
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, automount_result, AutomountResult);
+1 -1
View File
@@ -21,9 +21,9 @@
#include "bus-util.h"
#include "busname.h"
#include "dbus-busname.h"
#include "string-util.h"
#include "unit.h"
#include "dbus-busname.h"
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, busname_result, BusNameResult);
+2 -2
View File
@@ -19,9 +19,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "unit.h"
#include "device.h"
#include "dbus-device.h"
#include "device.h"
#include "unit.h"
const sd_bus_vtable bus_device_vtable[] = {
SD_BUS_VTABLE_START(0),
+2 -3
View File
@@ -19,11 +19,10 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "signal-util.h"
#include "bus-util.h"
#include "kill.h"
#include "dbus-kill.h"
#include "kill.h"
#include "signal-util.h"
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_kill_mode, kill_mode, KillMode);
+1 -1
View File
@@ -23,10 +23,10 @@
#include "dbus-cgroup.h"
#include "dbus-execute.h"
#include "dbus-kill.h"
#include "dbus-mount.h"
#include "mount.h"
#include "string-util.h"
#include "unit.h"
#include "dbus-mount.h"
static int property_get_what(
sd_bus *bus,
+1 -1
View File
@@ -20,10 +20,10 @@
***/
#include "bus-util.h"
#include "dbus-path.h"
#include "path.h"
#include "string-util.h"
#include "unit.h"
#include "dbus-path.h"
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, path_result, PathResult);
+2 -2
View File
@@ -19,10 +19,10 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "unit.h"
#include "slice.h"
#include "dbus-cgroup.h"
#include "dbus-slice.h"
#include "slice.h"
#include "unit.h"
const sd_bus_vtable bus_slice_vtable[] = {
SD_BUS_VTABLE_START(0),
+1 -1
View File
@@ -23,10 +23,10 @@
#include "bus-util.h"
#include "dbus-cgroup.h"
#include "dbus-execute.h"
#include "dbus-swap.h"
#include "string-util.h"
#include "swap.h"
#include "unit.h"
#include "dbus-swap.h"
static int property_get_priority(
sd_bus *bus,
+1 -1
View File
@@ -19,8 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "unit.h"
#include "dbus-target.h"
#include "unit.h"
const sd_bus_vtable bus_target_vtable[] = {
SD_BUS_VTABLE_START(0),
+1 -2
View File
@@ -22,11 +22,10 @@
#include <errno.h>
#include <sys/epoll.h>
#include "libudev.h"
#include "alloc-util.h"
#include "dbus-device.h"
#include "device.h"
#include "libudev.h"
#include "log.h"
#include "parse-util.h"
#include "path-util.h"
+1 -1
View File
@@ -25,12 +25,12 @@
#include "alloc-util.h"
#include "fileio.h"
#include "hostname-setup.h"
#include "hostname-util.h"
#include "log.h"
#include "macro.h"
#include "string-util.h"
#include "util.h"
#include "hostname-setup.h"
int hostname_setup(void) {
int r;
+1 -1
View File
@@ -21,8 +21,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
#include "fd-util.h"
#include "fileio.h"
+3 -3
View File
@@ -19,17 +19,17 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#ifdef HAVE_KMOD
#include <libkmod.h>
#endif
#include "macro.h"
#include "capability-util.h"
#include "bus-util.h"
#include "capability-util.h"
#include "kmod-setup.h"
#include "macro.h"
#ifdef HAVE_KMOD
static void systemd_kmod_log(
+3 -3
View File
@@ -20,13 +20,13 @@
***/
#include "unit.h"
#include "conf-parser.h"
#include "load-dropin.h"
#include "load-fragment.h"
#include "log.h"
#include "strv.h"
#include "unit-name.h"
#include "conf-parser.h"
#include "load-fragment.h"
#include "unit.h"
static int add_dependency_consumer(
UnitDependency dependency,
+1 -1
View File
@@ -32,8 +32,8 @@
#include <sys/resource.h>
#include <sys/stat.h>
#include "alloc-util.h"
#include "af-list.h"
#include "alloc-util.h"
#include "bus-error.h"
#include "bus-internal.h"
#include "bus-util.h"
+1 -1
View File
@@ -24,12 +24,12 @@
#include "env-util.h"
#include "fileio.h"
#include "locale-setup.h"
#include "locale-util.h"
#include "string-util.h"
#include "strv.h"
#include "util.h"
#include "virt.h"
#include "locale-setup.h"
int locale_setup(char ***environment) {
char **add;
+1 -1
View File
@@ -37,8 +37,8 @@
#include <valgrind/valgrind.h>
#endif
#include "sd-daemon.h"
#include "sd-bus.h"
#include "sd-daemon.h"
#include "alloc-util.h"
#include "architecture.h"
+3 -3
View File
@@ -19,11 +19,11 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <sys/mount.h>
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <ftw.h>
#include <stdlib.h>
#include <sys/mount.h>
#include <unistd.h>
#include "alloc-util.h"
#include "bus-util.h"
+2 -2
View File
@@ -23,10 +23,10 @@
#ifdef HAVE_SELINUX
#include <stdio.h>
#include <errno.h>
#include <selinux/selinux.h>
#include <selinux/avc.h>
#include <selinux/selinux.h>
#include <stdio.h>
#ifdef HAVE_AUDIT
#include <libaudit.h>
#endif
+1 -1
View File
@@ -29,10 +29,10 @@
#include "log.h"
#include "macro.h"
#include "selinux-setup.h"
#include "selinux-util.h"
#include "string-util.h"
#include "util.h"
#include "selinux-setup.h"
#ifdef HAVE_SELINUX
_printf_(2,3)
+1 -1
View File
@@ -24,12 +24,12 @@
#include "alloc-util.h"
#include "dbus-slice.h"
#include "log.h"
#include "slice.h"
#include "special.h"
#include "string-util.h"
#include "strv.h"
#include "unit-name.h"
#include "unit.h"
#include "slice.h"
static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = {
[SLICE_DEAD] = UNIT_INACTIVE,
+1 -2
View File
@@ -24,8 +24,6 @@
#include <sys/stat.h>
#include <unistd.h>
#include "libudev.h"
#include "alloc-util.h"
#include "dbus-swap.h"
#include "escape.h"
@@ -33,6 +31,7 @@
#include "fd-util.h"
#include "formats-util.h"
#include "fstab-util.h"
#include "libudev.h"
#include "parse-util.h"
#include "path-util.h"
#include "process-util.h"
+1 -1
View File
@@ -19,8 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
#include "alloc-util.h"
#include "bus-common-errors.h"
+1 -2
View File
@@ -27,12 +27,11 @@
#include <sys/mount.h>
#include <sys/swap.h>
#include "libudev.h"
#include "alloc-util.h"
#include "escape.h"
#include "fd-util.h"
#include "fstab-util.h"
#include "libudev.h"
#include "list.h"
#include "mount-setup.h"
#include "path-util.h"