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
+2 -2
View File
@@ -19,9 +19,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "util.h"
#include "siphash24.h"
#include "bus-bloom.h"
#include "siphash24.h"
#include "util.h"
static inline void set_bit(uint64_t filter[], unsigned long b) {
filter[b >> 6] |= 1ULL << (b & 63);
+2 -1
View File
@@ -22,8 +22,9 @@
#include <errno.h>
#include "sd-bus.h"
#include "bus-error.h"
#include "bus-common-errors.h"
#include "bus-error.h"
BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = {
SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_UNIT, ENOENT),
+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 "bus-container.h"
#include "bus-internal.h"
+1 -1
View File
@@ -23,8 +23,8 @@
#include <valgrind/memcheck.h>
#endif
#include <stddef.h>
#include <errno.h>
#include <stddef.h>
#include "sd-bus.h"
+1 -1
View File
@@ -29,10 +29,10 @@
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-error.h"
#include "errno-list.h"
#include "string-util.h"
#include "util.h"
#include "bus-error.h"
BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.Failed", EACCES),
+1 -1
View File
@@ -19,9 +19,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "bus-type.h"
#include "bus-gvariant.h"
#include "bus-signature.h"
#include "bus-type.h"
int bus_gvariant_get_size(const char *signature) {
const char *p;
+1 -1
View File
@@ -23,6 +23,7 @@
#include "bus-internal.h"
#include "bus-introspect.h"
#include "bus-message.h"
#include "bus-objects.h"
#include "bus-signature.h"
#include "bus-slot.h"
#include "bus-type.h"
@@ -30,7 +31,6 @@
#include "set.h"
#include "string-util.h"
#include "strv.h"
#include "bus-objects.h"
static int node_vtable_get_userdata(
sd_bus *bus,
+1 -1
View File
@@ -24,8 +24,8 @@
#include "alloc-util.h"
#include "bus-control.h"
#include "bus-objects.h"
#include "string-util.h"
#include "bus-slot.h"
#include "string-util.h"
sd_bus_slot *bus_slot_allocate(
sd_bus *bus,
+4 -4
View File
@@ -20,12 +20,12 @@
***/
#include <endian.h>
#include <stdlib.h>
#include <unistd.h>
#include <netdb.h>
#include <poll.h>
#include <sys/mman.h>
#include <pthread.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <unistd.h>
#include "sd-bus.h"
@@ -46,10 +46,10 @@
#include "cgroup-util.h"
#include "def.h"
#include "fd-util.h"
#include "hexdecoct.h"
#include "hostname-util.h"
#include "macro.h"
#include "missing.h"
#include "hexdecoct.h"
#include "parse-util.h"
#include "string-util.h"
#include "strv.h"
+4 -4
View File
@@ -19,10 +19,10 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <stdlib.h>
#include <pthread.h>
#include <unistd.h>
#include <fcntl.h>
#include <pthread.h>
#include <stdlib.h>
#include <unistd.h>
#include "sd-bus.h"
@@ -31,11 +31,11 @@
#include "bus-internal.h"
#include "bus-match.h"
#include "bus-util.h"
#include "fd-util.h"
#include "formats-util.h"
#include "log.h"
#include "macro.h"
#include "util.h"
#include "fd-util.h"
static int match_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
log_info("Match triggered! interface=%s member=%s", strna(sd_bus_message_get_interface(m)), strna(sd_bus_message_get_member(m)));
+1
View File
@@ -20,6 +20,7 @@
***/
#include "sd-bus.h"
#include "bus-dump.h"
#include "bus-util.h"
#include "cgroup-util.h"
+2 -1
View File
@@ -20,10 +20,11 @@
***/
#include "sd-bus.h"
#include "bus-common-errors.h"
#include "bus-error.h"
#include "bus-util.h"
#include "errno-list.h"
#include "bus-common-errors.h"
static void test_error(void) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL, second = SD_BUS_ERROR_NULL;
+1 -1
View File
@@ -19,8 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "log.h"
#include "bus-introspect.h"
#include "log.h"
static int prop_get(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error) {
return -EINVAL;
+2 -2
View File
@@ -19,8 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <stdlib.h>
#include <math.h>
#include <stdlib.h>
#ifdef HAVE_GLIB
#include <gio/gio.h>
@@ -38,8 +38,8 @@
#include "bus-message.h"
#include "bus-util.h"
#include "fd-util.h"
#include "log.h"
#include "hexdecoct.h"
#include "log.h"
#include "util.h"
static void test_bus_path_encode_unique(void) {
+3 -4
View File
@@ -19,13 +19,12 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "log.h"
#include "macro.h"
#include "bus-match.h"
#include "bus-message.h"
#include "bus-util.h"
#include "bus-slot.h"
#include "bus-util.h"
#include "log.h"
#include "macro.h"
static bool mask[32];
+1 -1
View File
@@ -19,8 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <stdlib.h>
#include <pthread.h>
#include <stdlib.h>
#include "sd-bus.h"
+3 -3
View File
@@ -19,10 +19,10 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "string-util.h"
#include "log.h"
#include "bus-signature.h"
#include "bus-internal.h"
#include "bus-signature.h"
#include "log.h"
#include "string-util.h"
int main(int argc, char *argv[]) {
char prefix[256];
+1 -1
View File
@@ -27,11 +27,11 @@
#include "bus-dump.h"
#include "bus-kernel.h"
#include "bus-message.h"
#include "fd-util.h"
#include "log.h"
#include "memfd-util.h"
#include "string-util.h"
#include "util.h"
#include "fd-util.h"
#define FIRST_ARRAY 17
#define SECOND_ARRAY 33
+1 -1
View File
@@ -26,9 +26,9 @@
#include "sd-id128.h"
#include "fd-util.h"
#include "hexdecoct.h"
#include "io-util.h"
#include "macro.h"
#include "hexdecoct.h"
#include "random-util.h"
#include "util.h"
+2 -2
View File
@@ -23,9 +23,9 @@
#include "sd-netlink.h"
#include "alloc-util.h"
#include "netlink-util.h"
#include "macro.h"
#include "local-addresses.h"
#include "macro.h"
#include "netlink-util.h"
static int address_compare(const void *_a, const void *_b) {
const struct local_address *a = _a, *b = _b;
+1 -1
View File
@@ -21,8 +21,8 @@
#include "sd-netlink.h"
#include "netlink-util.h"
#include "netlink-internal.h"
#include "netlink-util.h"
int rtnl_set_link_name(sd_netlink **rtnl, int ifindex, const char *name) {
_cleanup_netlink_message_unref_ sd_netlink_message *message = NULL;
@@ -19,10 +19,10 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "af-list.h"
#include "alloc-util.h"
#include "in-addr-util.h"
#include "local-addresses.h"
#include "af-list.h"
static void print_local_addresses(struct local_address *a, unsigned n) {
unsigned i;
+1 -1
View File
@@ -21,8 +21,8 @@
#include "sd-utf8.h"
#include "util.h"
#include "utf8.h"
#include "util.h"
_public_ const char *sd_utf8_is_valid(const char *s) {
assert_return(s, NULL);