Some minor cleanups

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index cb60108efe2412aee13e1e597635581bbc15fc54..30bb4664fabfaa848174fb4cb870a998743bdf03 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1835,7 +1835,6 @@ int cg_path_get_owner_uid(const char *path, uid_t *uid) {
                 return -ENXIO;
 
         *end = 0;
-
         if (parse_uid(start, uid) < 0)
                 return -ENXIO;
 #else

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 14aa68cbf11381f721545ec3f9b272a03eb86fad..be5103f6cfc7513f963aba100f3ef4eb7ac4774b 100644 (file)
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -21,10 +21,10 @@
 
 #include <stdbool.h>
 
-//#include "list.h"
-//#include "time-util.h"
 #include "cgroup-util.h"
 //#include "ip-address-access.h"
+//#include "list.h"
+//#include "time-util.h"
 
 #if 0 /// UNNEEDED by elogind
 typedef struct CGroupContext CGroupContext;

diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index 719deb760689bb6dac993752f017ab6ca3cae3c9..f50075ef5e0ee3f5006b7069e57bb842ea277e54 100644 (file)
--- a/src/libelogind/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
@@ -633,6 +633,7 @@ _public_ int sd_booted(void) {
         /* We test whether the runtime unit file directory has been
          * created. This takes place in mount-setup.c, so is
          * guaranteed to happen very early during boot. */
+
 #if 0 /// elogind is always used without systemd running the show. (Well, it should...)
         return laccess("/run/systemd/system/", F_OK) >= 0;
 #else

diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 0730f12e4de7dbed02a1e3aada7d5ebf0b774cef..cff1e334357000fb34c267a3ff26df86c2d6ccfe 100644 (file)
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -147,7 +147,6 @@ int sd_bus_can_send(sd_bus *bus, char type);
 int sd_bus_get_creds_mask(sd_bus *bus, uint64_t *creds_mask);
 int sd_bus_set_allow_interactive_authorization(sd_bus *bus, int b);
 int sd_bus_get_allow_interactive_authorization(sd_bus *bus);
-
 int sd_bus_set_exit_on_disconnect(sd_bus *bus, int b);
 int sd_bus_get_exit_on_disconnect(sd_bus *bus);
 

diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index f0e83cc93af5fefa285d9a8e2df319e0bceb9502..f8cb895660516b839dd8bd39c6ab25a640429321 100644 (file)
--- a/src/systemd/sd-event.h
+++ b/src/systemd/sd-event.h
@@ -102,59 +102,38 @@ int sd_event_get_fd(sd_event *e);
 int sd_event_get_state(sd_event *e);
 int sd_event_get_tid(sd_event *e, pid_t *tid);
 int sd_event_get_exit_code(sd_event *e, int *code);
-
 int sd_event_set_watchdog(sd_event *e, int b);
-
 int sd_event_get_watchdog(sd_event *e);
-
 int sd_event_get_iteration(sd_event *e, uint64_t *ret);
 
-
 sd_event_source* sd_event_source_ref(sd_event_source *s);
-
 sd_event_source* sd_event_source_unref(sd_event_source *s);
 
 sd_event *sd_event_source_get_event(sd_event_source *s);
-
 void* sd_event_source_get_userdata(sd_event_source *s);
 void* sd_event_source_set_userdata(sd_event_source *s, void *userdata);
 
-
 int sd_event_source_set_description(sd_event_source *s, const char *description);
-
 int sd_event_source_get_description(sd_event_source *s, const char **description);
-
 int sd_event_source_set_prepare(sd_event_source *s, sd_event_handler_t callback);
-
 int sd_event_source_get_pending(sd_event_source *s);
-
 int sd_event_source_get_priority(sd_event_source *s, int64_t *priority);
 int sd_event_source_set_priority(sd_event_source *s, int64_t priority);
-
 int sd_event_source_get_enabled(sd_event_source *s, int *enabled);
-
 int sd_event_source_set_enabled(sd_event_source *s, int enabled);
-
 int sd_event_source_get_io_fd(sd_event_source *s);
-
 int sd_event_source_set_io_fd(sd_event_source *s, int fd);
-
 int sd_event_source_get_io_events(sd_event_source *s, uint32_t* events);
-
 int sd_event_source_set_io_events(sd_event_source *s, uint32_t events);
-
 int sd_event_source_get_io_revents(sd_event_source *s, uint32_t* revents);
-
 int sd_event_source_get_time(sd_event_source *s, uint64_t *usec);
 int sd_event_source_set_time(sd_event_source *s, uint64_t usec);
-
 int sd_event_source_get_time_accuracy(sd_event_source *s, uint64_t *usec);
 int sd_event_source_set_time_accuracy(sd_event_source *s, uint64_t usec);
 int sd_event_source_get_time_clock(sd_event_source *s, clockid_t *clock);
 int sd_event_source_get_signal(sd_event_source *s);
 int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid);
 
-
 /* Define helpers so that __attribute__((cleanup(sd_event_unrefp))) and similar may be used. */
 _SD_DEFINE_POINTER_CLEANUP_FUNC(sd_event, sd_event_unref);
 _SD_DEFINE_POINTER_CLEANUP_FUNC(sd_event_source, sd_event_source_unref);

diff --git a/src/test/meson.build b/src/test/meson.build
index 77722de004e51cf4dee5682fbb44ac3523f6339a..e6865a67979196a8343d882e80e2329c29bbb1dc 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -23,8 +23,8 @@ generate_sym_test_py = find_program('generate-sym-test.py')
 
 test_libelogind_sym_c = custom_target(
         'test-libelogind-sym.c',
-        input : [libelogind_sym_path] + systemd_headers,
         output : 'test-libelogind-sym.c',
+        input : [libelogind_sym_path] + systemd_headers,
         command : [generate_sym_test_py, libelogind_sym_path] + systemd_headers,
         capture : true)
 

diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 7c5e9e3920aa8e7aa08149cf90520eaf9964d944..06ef8f781567fdcf47a7aa674fda6dcfca150c3d 100755 (executable)
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -4,7 +4,6 @@
 #  This file is part of elogind.
 #
 #  Copyright 2012-2013 Zbigniew Jędrzejewski-Szmek
-#  Copyright 2017      Sven Eden
 #
 #  elogind is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
@@ -39,12 +38,6 @@ TEMPLATE = '''\
                                 <surname>Jędrzejewski-Szmek</surname>
                                 <email>zbyszek@in.waw.pl</email>
                         </author>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Sven</firstname>
-                                <surname>Eden</surname>
-                                <email>sven.eden@gmx.de</email>
-                        </author>
                 </authorgroup>
         </refentryinfo>
 
@@ -58,6 +51,24 @@ TEMPLATE = '''\
                 <refpurpose>Index of configuration directives</refpurpose>
         </refnamediv>
 
+        <refsect1>
+                <title>Unit directives</title>
+
+                <para>Directives for configuring units, used in unit
+                files.</para>
+
+                <variablelist id='unit-directives' />
+        </refsect1>
+
+        <refsect1>
+                <title>Options on the kernel command line</title>
+
+                <para>Kernel boot options for configuring the behaviour of the
+                elogind process.</para>
+
+                <variablelist id='kernel-commandline-options' />
+        </refsect1>
+
         <refsect1>
                 <title>Environment variables</title>
 
@@ -67,6 +78,33 @@ TEMPLATE = '''\
                 <variablelist id='environment-variables' />
         </refsect1>
 
+        <refsect1>
+                <title>UDEV directives</title>
+
+                <para>Directives for configuring elogind units through the
+                udev database.</para>
+
+                <variablelist id='udev-directives' />
+        </refsect1>
+
+        <refsect1>
+                <title>Network directives</title>
+
+                <para>Directives for configuring network links through the
+                net-setup-link udev builtin and networks through
+                elogind-networkd.</para>
+
+                <variablelist id='network-directives' />
+        </refsect1>
+
+        <refsect1>
+                <title>Journal fields</title>
+
+                <para>Fields in the journal events with a well known meaning.</para>
+
+                <variablelist id='journal-directives' />
+        </refsect1>
+
         <refsect1>
                 <title>PAM configuration directives</title>
 
@@ -75,6 +113,25 @@ TEMPLATE = '''\
                 <variablelist id='pam-directives' />
         </refsect1>
 
+        <refsect1>
+                <title><filename>/etc/crypttab</filename> and
+                <filename>/etc/fstab</filename> options</title>
+
+                <para>Options which influence mounted filesystems and
+                encrypted volumes.</para>
+
+                <variablelist id='fstab-options' />
+        </refsect1>
+
+        <refsect1>
+                <title>System manager directives</title>
+
+                <para>Directives for configuring the behaviour of the
+                elogind process.</para>
+
+                <variablelist id='elogind-directives' />
+        </refsect1>
+
         <refsect1>
                 <title>command line options</title>