[systemd-commits] 4 commits - man/sd_journal_get_fd.xml src/ask-password src/boot src/bus-proxyd src/core src/initctl src/journal src/libsystemd src/libsystemd-network src/libudev src/reply-password src/resolve src/shared src/shutdownd src/systemctl src/test src/tty-ask-password-agent src/udev

Thomas H.P. Andersen phomes at kemper.freedesktop.org
Thu Feb 12 12:01:07 PST 2015


 man/sd_journal_get_fd.xml                           |    2 +-
 src/ask-password/ask-password.c                     |    2 +-
 src/boot/boot-loader.h                              |    2 ++
 src/bus-proxyd/bus-proxyd.c                         |    2 +-
 src/bus-proxyd/proxy.c                              |    2 +-
 src/bus-proxyd/stdio-bridge.c                       |    2 +-
 src/bus-proxyd/test-bus-xml-policy.c                |    2 +-
 src/core/cgroup.h                                   |    3 +++
 src/core/execute.c                                  |    2 +-
 src/core/execute.h                                  |    1 +
 src/core/manager.c                                  |    2 +-
 src/core/path.h                                     |    1 +
 src/core/unit.c                                     |    2 +-
 src/core/unit.h                                     |    2 +-
 src/initctl/initctl.c                               |    2 +-
 src/journal/journal-internal.h                      |    1 +
 src/journal/sd-journal.c                            |    2 +-
 src/libsystemd-network/dhcp-identifier.h            |    1 +
 src/libsystemd/sd-bus/bus-bloom.h                   |    2 ++
 src/libsystemd/sd-bus/bus-gvariant.h                |    2 ++
 src/libsystemd/sd-bus/bus-socket.c                  |    2 +-
 src/libsystemd/sd-bus/bus-type.h                    |    1 +
 src/libsystemd/sd-bus/busctl-introspect.h           |    1 +
 src/libsystemd/sd-bus/sd-bus.c                      |    2 +-
 src/libsystemd/sd-login/sd-login.c                  |    2 +-
 src/libsystemd/sd-login/test-login.c                |    2 +-
 src/libsystemd/sd-network/sd-network.c              |    2 +-
 src/libsystemd/sd-resolve/sd-resolve.c              |    2 +-
 src/libudev/libudev-monitor.c                       |    2 +-
 src/reply-password/reply-password.c                 |    2 +-
 src/resolve/resolved-manager.c                      |    2 +-
 src/shared/ask-password-api.c                       |    2 +-
 src/shared/btrfs-ctree.h                            |    1 +
 src/shared/clock-util.h                             |    2 ++
 src/shared/env-util.h                               |    2 ++
 src/shared/logs-show.c                              |    2 +-
 src/shared/ptyfwd.h                                 |    2 ++
 src/shared/spawn-polkit-agent.c                     |    2 +-
 src/shared/uid-range.h                              |    1 +
 src/shared/util.c                                   |    2 +-
 src/shared/utmp-wtmp.c                              |    2 +-
 src/shutdownd/shutdownd.c                           |    2 +-
 src/systemctl/systemctl.c                           |    1 -
 src/test/test-util.c                                |    2 +-
 src/tty-ask-password-agent/tty-ask-password-agent.c |    2 +-
 src/udev/udev-ctrl.c                                |    2 +-
 src/udev/udev-event.c                               |    2 +-
 src/udev/udevadm-settle.c                           |    2 +-
 src/udev/udevadm-test-builtin.c                     |    2 +-
 src/udev/udevd.c                                    |    2 +-
 50 files changed, 57 insertions(+), 35 deletions(-)

New commits:
commit 0a6f50c0afdfc434b492493bd9efab20cbee8623
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Thu Feb 12 14:06:32 2015 +0100

    include <poll.h> instead of <sys/poll.h>
    
    include-what-you-use automatically does this and it makes finding
    unnecessary harder to spot. The only content of poll.h is a include
    of sys/poll.h so should be harmless.

diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index aaf53b9..3a38f73 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) {
     example lacks all error checking for the sake of
     simplicity):</para>
 
-    <programlisting>#include <sys/poll.h>
+    <programlisting>#include <poll.h>
 #include <systemd/sd-journal.h>
 
 int wait_for_changes(sd_journal *j) {
diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index 1ce8776..ad8ad65 100644
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -20,7 +20,7 @@
 ***/
 
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <string.h>
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 8cc4412..e07761a 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/prctl.h>
 #include <stddef.h>
 #include <getopt.h>
diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
index bd02ee1..2a3de70 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/bus-proxyd/proxy.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <stddef.h>
 #include <getopt.h>
 
diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c
index 6fb8303..434a989 100644
--- a/src/bus-proxyd/stdio-bridge.c
+++ b/src/bus-proxyd/stdio-bridge.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <stddef.h>
 #include <getopt.h>
 
diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/bus-proxyd/test-bus-xml-policy.c
index 4b07747..421487e 100644
--- a/src/bus-proxyd/test-bus-xml-policy.c
+++ b/src/bus-proxyd/test-bus-xml-policy.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <stddef.h>
 #include <getopt.h>
 
diff --git a/src/core/execute.c b/src/core/execute.c
index 340b800..2c23db0 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -37,7 +37,7 @@
 #include <sys/mount.h>
 #include <linux/fs.h>
 #include <linux/oom.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <glob.h>
 #include <sys/personality.h>
 
diff --git a/src/core/manager.c b/src/core/manager.c
index 5fba004..4775219 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/inotify.h>
 #include <sys/epoll.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/reboot.h>
 #include <sys/ioctl.h>
 #include <linux/kd.h>
diff --git a/src/core/unit.c b/src/core/unit.c
index 514b649..ee8e607 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index d7cd4ba..7a6a383 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/epoll.h>
 #include <sys/un.h>
 #include <fcntl.h>
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index ecf47fd..94891cd 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -24,7 +24,7 @@
 #include <stddef.h>
 #include <unistd.h>
 #include <sys/inotify.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/vfs.h>
 #include <linux/magic.h>
 
diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index d3eb834..52883fa 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <byteswap.h>
 
 #include "util.h"
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 1bf77e4..cac9b65 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <netdb.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <byteswap.h>
 #include <sys/mman.h>
 #include <pthread.h>
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index c171405..f71749f 100644
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/inotify.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include "util.h"
 #include "cgroup-util.h"
diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c
index 28f88a1..2802e82 100644
--- a/src/libsystemd/sd-login/test-login.c
+++ b/src/libsystemd/sd-login/test-login.c
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/poll.h>
+#include <poll.h>
 #include <string.h>
 
 #include "systemd/sd-login.h"
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index c735cac..c4713fe 100644
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/inotify.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <net/if.h>
 
 #include "util.h"
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index fea695f..6448280 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -40,7 +40,7 @@
 #include <stdint.h>
 #include <pthread.h>
 #include <sys/prctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include "util.h"
 #include "list.h"
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 08ddde8..3f1fee7 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 #include <dirent.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 54683b6..abf5f52 100644
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -20,7 +20,7 @@
 ***/
 
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <string.h>
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 890cc04..b5ad701 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -23,7 +23,7 @@
 #include <resolv.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <netinet/in.h>
 
 #include "rtnl-util.h"
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index d6589a6..0a61daf 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <termios.h>
 #include <unistd.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/inotify.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 45741f9..c249505 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <assert.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 006ad53..8f259a8 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -27,7 +27,7 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include "log.h"
 #include "util.h"
diff --git a/src/shared/util.c b/src/shared/util.c
index f5fcebe..3a63351 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -39,7 +39,7 @@
 #include <linux/tiocl.h>
 #include <termios.h>
 #include <stdarg.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <ctype.h>
 #include <sys/prctl.h>
 #include <sys/utsname.h>
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 31f13ec..bdb962a 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -26,7 +26,7 @@
 #include <sys/utsname.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include "macro.h"
 #include "path-util.h"
diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index 826efbf..701882b 100644
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -20,7 +20,7 @@
 ***/
 
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <sys/timerfd.h>
 #include <assert.h>
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index bdf6512..47093b8 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <stddef.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/inotify.h>
 #include <unistd.h>
 #include <getopt.h>
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 538b342..7b5ef6b 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index a8dd462..bc115f1 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -26,7 +26,7 @@
 #include <time.h>
 #include <net/if.h>
 #include <sys/prctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/epoll.h>
 #include <sys/wait.h>
 #include <sys/signalfd.h>
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 6bcb3a9..fff5de7 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -28,7 +28,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include <time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
index b2a7376..baaeca9 100644
--- a/src/udev/udevadm-test-builtin.c
+++ b/src/udev/udevadm-test-builtin.c
@@ -27,7 +27,7 @@
 #include <signal.h>
 #include <time.h>
 #include <sys/inotify.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 009e2fe..99d4c89 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -39,7 +39,7 @@
 #include <sys/signalfd.h>
 #include <sys/epoll.h>
 #include <sys/mount.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>

commit c1ff5570f4a04bb9aedea444c12dce81679224ec
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Tue Feb 10 12:56:53 2015 +0100

    Add missing includes in header files
    
    This fixes various issues found by globally reordering the include
    sections of all .c files.

diff --git a/src/boot/boot-loader.h b/src/boot/boot-loader.h
index 08827c3..b3fcdee 100644
--- a/src/boot/boot-loader.h
+++ b/src/boot/boot-loader.h
@@ -21,5 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "boot.h"
+
 int boot_loader_read_entries(struct boot_info *info);
 int boot_loader_find_active_entry(struct boot_info *info, const char *loader_active);
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 7150e5e..8fa851d 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -21,7 +21,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+
 #include "list.h"
+#include "time-util.h"
 
 typedef struct CGroupContext CGroupContext;
 typedef struct CGroupDeviceAllow CGroupDeviceAllow;
diff --git a/src/core/execute.h b/src/core/execute.h
index 153867c..6e0c9fa 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -199,6 +199,7 @@ struct ExecContext {
 };
 
 #include "cgroup.h"
+#include "cgroup-util.h"
 
 struct ExecParameters {
         char **argv;
diff --git a/src/core/path.h b/src/core/path.h
index d2e91d7..0d36aab 100644
--- a/src/core/path.h
+++ b/src/core/path.h
@@ -22,6 +22,7 @@
 ***/
 
 typedef struct Path Path;
+typedef struct PathSpec PathSpec;
 
 #include "unit.h"
 #include "mount.h"
diff --git a/src/core/unit.h b/src/core/unit.h
index 53b8a7f..291bc77 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -259,8 +259,8 @@ typedef enum UnitSetPropertiesMode {
 #include "automount.h"
 #include "swap.h"
 #include "timer.h"
-#include "path.h"
 #include "slice.h"
+#include "path.h"
 #include "scope.h"
 
 struct UnitVTable {
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index e99050c..b51ecdb 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -32,6 +32,7 @@
 #include "hashmap.h"
 #include "set.h"
 #include "journal-file.h"
+#include "sd-journal.h"
 
 typedef struct Match Match;
 typedef struct Location Location;
diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h
index cbec03e..7f44d25 100644
--- a/src/libsystemd-network/dhcp-identifier.h
+++ b/src/libsystemd-network/dhcp-identifier.h
@@ -23,6 +23,7 @@
 
 #include <net/ethernet.h>
 
+#include "macro.h"
 #include "sparse-endian.h"
 #include "sd-id128.h"
 
diff --git a/src/libsystemd/sd-bus/bus-bloom.h b/src/libsystemd/sd-bus/bus-bloom.h
index 0dad5db..96c82d7 100644
--- a/src/libsystemd/sd-bus/bus-bloom.h
+++ b/src/libsystemd/sd-bus/bus-bloom.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+#include <stdint.h>
 #include <sys/types.h>
 
 /*
diff --git a/src/libsystemd/sd-bus/bus-gvariant.h b/src/libsystemd/sd-bus/bus-gvariant.h
index b4bd2a5..fdf5335 100644
--- a/src/libsystemd/sd-bus/bus-gvariant.h
+++ b/src/libsystemd/sd-bus/bus-gvariant.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "macro.h"
+
 int bus_gvariant_get_size(const char *signature) _pure_;
 int bus_gvariant_get_alignment(const char *signature) _pure_;
 int bus_gvariant_is_fixed_size(const char *signature) _pure_;
diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h
index 581e8d5..0e50783 100644
--- a/src/libsystemd/sd-bus/bus-type.h
+++ b/src/libsystemd/sd-bus/bus-type.h
@@ -23,6 +23,7 @@
 
 #include <stdbool.h>
 
+#include "macro.h"
 #include "sd-bus.h"
 #include "sd-bus-protocol.h"
 
diff --git a/src/libsystemd/sd-bus/busctl-introspect.h b/src/libsystemd/sd-bus/busctl-introspect.h
index 9bea437..d6b4cf0 100644
--- a/src/libsystemd/sd-bus/busctl-introspect.h
+++ b/src/libsystemd/sd-bus/busctl-introspect.h
@@ -22,6 +22,7 @@
 ***/
 
 #include <inttypes.h>
+#include <stdbool.h>
 
 typedef struct XMLIntrospectOps {
         int (*on_path)(const char *path, void *userdata);
diff --git a/src/shared/btrfs-ctree.h b/src/shared/btrfs-ctree.h
index 7bdf3fe..8b6f1ab 100644
--- a/src/shared/btrfs-ctree.h
+++ b/src/shared/btrfs-ctree.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "macro.h"
 #include "sparse-endian.h"
 
 /* Stolen from btrfs' ctree.h */
diff --git a/src/shared/clock-util.h b/src/shared/clock-util.h
index 7ed371a..198a7b2 100644
--- a/src/shared/clock-util.h
+++ b/src/shared/clock-util.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "util.h"
+
 int clock_is_localtime(void);
 int clock_set_timezone(int *min);
 int clock_reset_timewarp(void);
diff --git a/src/shared/env-util.h b/src/shared/env-util.h
index fb3a52b..618441a 100644
--- a/src/shared/env-util.h
+++ b/src/shared/env-util.h
@@ -24,6 +24,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
+#include "macro.h"
+
 bool env_name_is_valid(const char *e);
 bool env_value_is_valid(const char *e);
 bool env_assignment_is_valid(const char *e);
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
index d65b66a..d3e229b 100644
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -23,7 +23,9 @@
 
 #include <sys/types.h>
 #include <signal.h>
+#include <stdbool.h>
 
+#include "util.h"
 #include "sd-event.h"
 
 typedef struct PTYForward PTYForward;
diff --git a/src/shared/uid-range.h b/src/shared/uid-range.h
index d3dac8d..45335e9 100644
--- a/src/shared/uid-range.h
+++ b/src/shared/uid-range.h
@@ -21,6 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
 #include <sys/types.h>
 
 typedef struct UidRange {

commit 76f282c636f33b41bdbc93a5b2945945ee0029bf
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Thu Feb 12 20:32:03 2015 +0100

    test-util: remove superfluous const

diff --git a/src/test/test-util.c b/src/test/test-util.c
index 804f522..9515a8c 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1237,7 +1237,7 @@ static void test_glob_exists(void) {
 static void test_execute_directory(void) {
         char template_lo[] = "/tmp/test-readlink_and_make_absolute-lo.XXXXXXX";
         char template_hi[] = "/tmp/test-readlink_and_make_absolute-hi.XXXXXXX";
-        const char const* dirs[] = {template_hi, template_lo, NULL};
+        const char * dirs[] = {template_hi, template_lo, NULL};
         const char *name, *name2, *name3, *overridden, *override, *masked, *mask;
 
         assert_se(mkdtemp(template_lo));

commit 8744505aaefad761cba0f0e5afaaf6bcec53906e
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Thu Feb 12 15:12:11 2015 +0100

    remove unused variable

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 7b81a9c..d1b7f8a 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2314,7 +2314,6 @@ static int unit_find_paths(sd_bus *bus,
                 _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
                 _cleanup_bus_message_unref_ sd_bus_message *unit_load_error = NULL;
                 _cleanup_free_ char *unit = NULL;
-                _cleanup_strv_free_ char **load_error = NULL;
                 char *unit_load_error_name, *unit_load_error_message;
 
                 unit = unit_dbus_path_from_name(unit_name);



More information about the systemd-commits mailing list