From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 4 Dec 2018 08:29:54 +0000 (+0100)
Subject: tree-wide: add whitespace between type and variable name
X-Git-Tag: v240~141^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F11042%2Fhead;p=thirdparty%2Fsystemd.git

tree-wide: add whitespace between type and variable name
---

diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index 2225208cd20..cf4d22fbce4 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -430,7 +430,7 @@ const char *special_glyph(SpecialGlyph code) {
         return draw_table[code >= _SPECIAL_GLYPH_FIRST_SMILEY ? emoji_enabled() : is_locale_utf8()][code];
 }
 
-void locale_variables_free(char*l[_VARIABLE_LC_MAX]) {
+void locale_variables_free(char *l[_VARIABLE_LC_MAX]) {
         LocaleVariable i;
 
         if (!l)
diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h
index 61abcd585b1..d373f03aca5 100644
--- a/src/basic/unit-name.h
+++ b/src/basic/unit-name.h
@@ -61,5 +61,5 @@ static inline int unit_name_mangle(const char *name, UnitNameMangle flags, char
 }
 
 int slice_build_parent_slice(const char *slice, char **ret);
-int slice_build_subslice(const char *slice, const char*name, char **subslice);
+int slice_build_subslice(const char *slice, const char *name, char **subslice);
 bool slice_name_is_valid(const char *name);
diff --git a/src/core/job.c b/src/core/job.c
index 2a630356bfa..40be7213ebd 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -306,7 +306,7 @@ void job_dependency_free(JobDependency *l) {
         free(l);
 }
 
-void job_dump(Job *j, FILE*f, const char *prefix) {
+void job_dump(Job *j, FILE *f, const char *prefix) {
         assert(j);
         assert(f);
 
diff --git a/src/core/job.h b/src/core/job.h
index db14a1732c6..5f9c14012ff 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -166,7 +166,7 @@ void job_free(Job *job);
 Job* job_install(Job *j);
 int job_install_deserialized(Job *j);
 void job_uninstall(Job *j);
-void job_dump(Job *j, FILE*f, const char *prefix);
+void job_dump(Job *j, FILE *f, const char *prefix);
 int job_serialize(Job *j, FILE *f);
 int job_deserialize(Job *j, FILE *f);
 int job_coldplug(Job *j);
diff --git a/src/journal/journald-audit.h b/src/journal/journald-audit.h
index 7766618c986..df41f814355 100644
--- a/src/journal/journald-audit.h
+++ b/src/journal/journald-audit.h
@@ -8,4 +8,4 @@ void server_process_audit_message(Server *s, const void *buffer, size_t buffer_s
 
 void process_audit_string(Server *s, int type, const char *data, size_t size);
 
-int server_open_audit(Server*s);
+int server_open_audit(Server *s);
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 7a43599329e..e86178ed775 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -433,7 +433,7 @@ void server_process_native_file(
         }
 }
 
-int server_open_native_socket(Server*s) {
+int server_open_native_socket(Server *s) {
 
         static const union sockaddr_union sa = {
                 .un.sun_family = AF_UNIX,
diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c
index f74b49d5010..8e839920b9b 100644
--- a/src/journal/test-journal-enum.c
+++ b/src/journal/test-journal-enum.c
@@ -11,7 +11,7 @@
 
 int main(int argc, char *argv[]) {
         unsigned n = 0;
-        _cleanup_(sd_journal_closep) sd_journal*j = NULL;
+        _cleanup_(sd_journal_closep) sd_journal *j = NULL;
 
         test_setup_logging(LOG_DEBUG);
 
diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c
index 897364201cf..b17527916cf 100644
--- a/src/journal/test-journal-match.c
+++ b/src/journal/test-journal-match.c
@@ -12,7 +12,7 @@
 #include "util.h"
 
 int main(int argc, char *argv[]) {
-        _cleanup_(sd_journal_closep) sd_journal*j = NULL;
+        _cleanup_(sd_journal_closep) sd_journal *j = NULL;
         _cleanup_free_ char *t;
 
         test_setup_logging(LOG_DEBUG);
diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 2ba6eaee7d1..6181fb163e1 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -245,7 +245,7 @@ fail:
         return r;
 }
 
-static void* client1(void*p) {
+static void* client1(void *p) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
@@ -344,7 +344,7 @@ static int quit_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_er
         return 1;
 }
 
-static void* client2(void*p) {
+static void* client2(void *p) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL;
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 34065a98c75..69f5667801d 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -505,7 +505,7 @@ static int localectl_main(sd_bus *bus, int argc, char *argv[]) {
         return dispatch_verb(argc, argv, verbs, bus);
 }
 
-static int run(int argc, char*argv[]) {
+static int run(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
diff --git a/src/login/logind-button.h b/src/login/logind-button.h
index 740cf0b7865..d009851cf44 100644
--- a/src/login/logind-button.h
+++ b/src/login/logind-button.h
@@ -20,7 +20,7 @@ struct Button {
 };
 
 Button* button_new(Manager *m, const char *name);
-void button_free(Button*b);
+void button_free(Button *b);
 int button_open(Button *b);
 int button_set_seat(Button *b, const char *sn);
 int button_check_switches(Button *b);
diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index 75c9303ff3c..a891b0af6fb 100644
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -65,7 +65,7 @@ static void print_inhibitors(sd_bus *bus) {
         printf("%u inhibitors\n", n);
 }
 
-int main(int argc, char*argv[]) {
+int main(int argc, char *argv[]) {
         _cleanup_(sd_bus_unrefp) sd_bus *bus = NULL;
         int fd1, fd2;
         int r;
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 5023acb5e23..2c21ba2db3d 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -3093,7 +3093,7 @@ static int machinectl_main(int argc, char *argv[], sd_bus *bus) {
         return dispatch_verb(argc, argv, verbs, bus);
 }
 
-static int run(int argc, char*argv[]) {
+static int run(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
diff --git a/src/resolve/test-dnssec.c b/src/resolve/test-dnssec.c
index 568d8e07904..840c4fa1db6 100644
--- a/src/resolve/test-dnssec.c
+++ b/src/resolve/test-dnssec.c
@@ -497,7 +497,7 @@ static void test_dnssec_nsec3_hash(void) {
 
 #endif
 
-int main(int argc, char*argv[]) {
+int main(int argc, char *argv[]) {
 
         test_dnssec_canonicalize();
 
diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index f8b2e87ed00..5ff60fe1912 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -1095,7 +1095,7 @@ finish:
         return 0;
 }
 
-static int dns_name_build_suffix_table(const char *name, const char*table[]) {
+static int dns_name_build_suffix_table(const char *name, const char *table[]) {
         const char *p;
         unsigned n = 0;
         int r;
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 41d484fa16f..fbf12761d85 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1031,7 +1031,7 @@ static int output_cat(
 
 static int (*output_funcs[_OUTPUT_MODE_MAX])(
                 FILE *f,
-                sd_journal*j,
+                sd_journal *j,
                 OutputMode mode,
                 unsigned n_columns,
                 OutputFlags flags,
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
index 4ebddcd7201..887d3cba53a 100644
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -19,7 +19,7 @@ typedef enum PTYForwardFlags {
         PTY_FORWARD_IGNORE_INITIAL_VHANGUP = 4,
 } PTYForwardFlags;
 
-typedef int (*PTYForwardHandler)(PTYForward *f, int rcode, void*userdata);
+typedef int (*PTYForwardHandler)(PTYForward *f, int rcode, void *userdata);
 
 int pty_forward_new(sd_event *event, int master, PTYForwardFlags flags, PTYForward **f);
 PTYForward *pty_forward_free(PTYForward *f);
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 7f289ad374e..be6627a3e68 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -8686,7 +8686,7 @@ static int logind_cancel_shutdown(void) {
 #endif
 }
 
-static int run(int argc, char*argv[]) {
+static int run(int argc, char *argv[]) {
         int r;
 
         argv_cmdline = argv[0];
diff --git a/src/systemd/sd-resolve.h b/src/systemd/sd-resolve.h
index 93a9a8a440e..d78e8db257c 100644
--- a/src/systemd/sd-resolve.h
+++ b/src/systemd/sd-resolve.h
@@ -101,11 +101,11 @@ int sd_resolve_getaddrinfo(sd_resolve *resolve, sd_resolve_query **q, const char
  * if you want to query the hostname (resp. the service name). */
 int sd_resolve_getnameinfo(sd_resolve *resolve, sd_resolve_query **q, const struct sockaddr *sa, socklen_t salen, int flags, uint64_t get, sd_resolve_getnameinfo_handler_t callback, void *userdata);
 
-sd_resolve_query *sd_resolve_query_ref(sd_resolve_query* q);
-sd_resolve_query *sd_resolve_query_unref(sd_resolve_query* q);
+sd_resolve_query *sd_resolve_query_ref(sd_resolve_query *q);
+sd_resolve_query *sd_resolve_query_unref(sd_resolve_query *q);
 
 /* Returns non-zero when the query operation specified by q has been completed. */
-int sd_resolve_query_is_done(sd_resolve_query*q);
+int sd_resolve_query_is_done(sd_resolve_query *q);
 
 void *sd_resolve_query_get_userdata(sd_resolve_query *q);
 void *sd_resolve_query_set_userdata(sd_resolve_query *q, void *userdata);
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 9211c996ac1..5cdfd2dc54e 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -9,7 +9,7 @@
 #include "string-util.h"
 #include "util.h"
 
-int main(int argc, char*argv[]) {
+int main(int argc, char *argv[]) {
         char *path;
         char *c, *p;
 
diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c
index c8a83f0fc92..a4b96da0457 100644
--- a/src/test/test-daemon.c
+++ b/src/test/test-daemon.c
@@ -7,7 +7,7 @@
 #include "parse-util.h"
 #include "strv.h"
 
-int main(int argc, char*argv[]) {
+int main(int argc, char *argv[]) {
         _cleanup_strv_free_ char **l = NULL;
         int n, i;
         usec_t duration = USEC_PER_SEC / 10;
diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c
index dc5f9eae837..d51e0d94fd3 100644
--- a/src/test/test-job-type.c
+++ b/src/test/test-job-type.c
@@ -6,7 +6,7 @@
 #include "service.h"
 #include "unit.h"
 
-int main(int argc, char*argv[]) {
+int main(int argc, char *argv[]) {
         JobType a, b, c, ab, bc, ab_c, bc_a, a_bc;
         const ServiceState test_states[] = { SERVICE_DEAD, SERVICE_RUNNING };
         unsigned i;
diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c
index b291aa0f045..801824ad677 100644
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -191,7 +191,7 @@ static void test_get_group_creds_one(const char *id, const char *name, gid_t gid
         assert_se(rgid == gid);
 }
 
-int main(int argc, char*argv[]) {
+int main(int argc, char *argv[]) {
         test_uid_to_name_one(0, "root");
         test_uid_to_name_one(UID_NOBODY, NOBODY_USER_NAME);
         test_uid_to_name_one(0xFFFF, "65535");
diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c
index 5ca8037cb97..490d9f01a9b 100644
--- a/src/user-sessions/user-sessions.c
+++ b/src/user-sessions/user-sessions.c
@@ -12,7 +12,7 @@
 #include "string-util.h"
 #include "util.h"
 
-static int run(int argc, char*argv[]) {
+static int run(int argc, char *argv[]) {
         int r, k;
 
         if (argc != 2)