From 6328540098383b453ed265576fdbadd3049b2963 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Thu, 14 Aug 2014 18:26:38 -0400 Subject: src/shared: some stylistic changes Signed-off-by: Anthony G. Basile --- src/shared/cgroup-util.c | 4 +--- src/shared/cgroup-util.h | 8 +++----- src/shared/conf-files.c | 4 +--- src/shared/conf-files.h | 8 +++----- src/shared/def.h | 8 +++----- src/shared/dev-setup.c | 4 +--- src/shared/dev-setup.h | 8 +++----- src/shared/device-nodes.c | 2 -- src/shared/device-nodes.h | 2 -- src/shared/exit-status.c | 4 +--- src/shared/exit-status.h | 8 +++----- src/shared/fileio.h | 1 + src/shared/hashmap.c | 4 +--- src/shared/hashmap.h | 8 +++----- src/shared/label.c | 4 +--- src/shared/label.h | 8 +++----- src/shared/log.c | 4 +--- src/shared/log.h | 8 +++----- src/shared/macro.h | 8 +++----- src/shared/missing.h | 8 +++----- src/shared/mkdir-label.c | 4 +--- src/shared/mkdir.c | 4 +--- src/shared/mkdir.h | 8 +++----- src/shared/path-util.c | 4 +--- src/shared/selinux-util.c | 2 +- src/shared/selinux-util.h | 2 +- src/shared/set.c | 4 +--- src/shared/set.h | 8 +++----- src/shared/strbuf.c | 4 +--- src/shared/strbuf.h | 8 +++----- src/shared/strv.c | 4 +--- src/shared/strv.h | 8 +++----- src/shared/strxcpyx.c | 2 -- src/shared/strxcpyx.h | 6 ++---- src/shared/udev-util.h | 8 +++----- src/shared/virt.c | 4 +--- src/shared/virt.h | 8 +++----- 37 files changed, 67 insertions(+), 134 deletions(-) diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index 34582a7eb6..76ab747292 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h index 11e7308e19..5c219b204e 100644 --- a/src/shared/cgroup-util.h +++ b/src/shared/cgroup-util.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include #include #include diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c index 2de4fe0a37..6675a1c26c 100644 --- a/src/shared/conf-files.c +++ b/src/shared/conf-files.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/conf-files.h b/src/shared/conf-files.h index b769e56845..9436290f40 100644 --- a/src/shared/conf-files.h +++ b/src/shared/conf-files.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010-2012 Lennart Poettering Copyright 2010-2012 Kay Sievers @@ -22,6 +18,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include "macro.h" int conf_files_list_strv(char ***strv, const char *suffix, const char *root, const char* const* dirs); diff --git a/src/shared/def.h b/src/shared/def.h index d4844f4186..f3c3bfde1b 100644 --- a/src/shared/def.h +++ b/src/shared/def.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include "util.h" #define SYSTEMD_CGROUP_CONTROLLER "name=systemd" diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c index 1a565d5470..8199a26f73 100644 --- a/src/shared/dev-setup.c +++ b/src/shared/dev-setup.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010-2012 Lennart Poettering diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h index d41b6eefba..0adea22a99 100644 --- a/src/shared/dev-setup.h +++ b/src/shared/dev-setup.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010-2012 Lennart Poettering @@ -21,4 +17,6 @@ along with systemd; If not, see . ***/ +#pragma once + int dev_setup(const char *pathprefix); diff --git a/src/shared/device-nodes.c b/src/shared/device-nodes.c index e235de83e1..658d3eaec3 100644 --- a/src/shared/device-nodes.c +++ b/src/shared/device-nodes.c @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** This file is part of eudev, forked from systemd. diff --git a/src/shared/device-nodes.h b/src/shared/device-nodes.h index 57ed97d326..d27ac09065 100644 --- a/src/shared/device-nodes.h +++ b/src/shared/device-nodes.h @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** This file is part of eudev, forked from systemd. diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c index 79bb8ca981..78616e6590 100644 --- a/src/shared/exit-status.c +++ b/src/shared/exit-status.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/exit-status.h b/src/shared/exit-status.h index e2570c65d2..5c726edac9 100644 --- a/src/shared/exit-status.h +++ b/src/shared/exit-status.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include "set.h" typedef struct ExitStatusSet { diff --git a/src/shared/fileio.h b/src/shared/fileio.h index d29e2dfa03..641bf0230b 100644 --- a/src/shared/fileio.h +++ b/src/shared/fileio.h @@ -16,6 +16,7 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . ***/ + #include #include diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c index b92c83202e..38dce11921 100644 --- a/src/shared/hashmap.c +++ b/src/shared/hashmap.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/hashmap.h b/src/shared/hashmap.h index cfd34750d9..b739262ab3 100644 --- a/src/shared/hashmap.h +++ b/src/shared/hashmap.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include #include "macro.h" diff --git a/src/shared/label.c b/src/shared/label.c index eb95c31692..3c6277a3ad 100644 --- a/src/shared/label.c +++ b/src/shared/label.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/label.h b/src/shared/label.h index ec64fa6816..592ef607cd 100644 --- a/src/shared/label.h +++ b/src/shared/label.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include #include #include diff --git a/src/shared/log.c b/src/shared/log.c index 56aa4e14d4..af6a983087 100644 --- a/src/shared/log.c +++ b/src/shared/log.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/log.h b/src/shared/log.h index 1b2a67a030..70d3ec2f61 100644 --- a/src/shared/log.h +++ b/src/shared/log.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include #include #include diff --git a/src/shared/macro.h b/src/shared/macro.h index 3e02d86b5c..112e901963 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include #include #include diff --git a/src/shared/missing.h b/src/shared/missing.h index 2cb12786b7..572e17117a 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + /* Missing glibc definitions to access certain kernel APIs */ #include diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c index 073ecab7b9..df501046dd 100644 --- a/src/shared/mkdir-label.c +++ b/src/shared/mkdir-label.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering Copyright 2013 Kay Sievers diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c index 874433dc90..e1e7f82a12 100644 --- a/src/shared/mkdir.c +++ b/src/shared/mkdir.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/mkdir.h b/src/shared/mkdir.h index 399f2c0ff6..bd7e2bcfe1 100644 --- a/src/shared/mkdir.h +++ b/src/shared/mkdir.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + int mkdir_parents(const char *path, mode_t mode); int mkdir_p(const char *path, mode_t mode); diff --git a/src/shared/path-util.c b/src/shared/path-util.c index 2a2f33dbca..aa439af90d 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010-2012 Lennart Poettering diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c index 16c74a4ac0..85e4bc00bf 100644 --- a/src/shared/selinux-util.c +++ b/src/shared/selinux-util.c @@ -1,5 +1,5 @@ /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/selinux-util.h b/src/shared/selinux-util.h index b5b8faa06a..3bcd17ce7a 100644 --- a/src/shared/selinux-util.h +++ b/src/shared/selinux-util.h @@ -1,5 +1,5 @@ /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/set.c b/src/shared/set.c index 3a4f7d049a..8b89d45cc4 100644 --- a/src/shared/set.c +++ b/src/shared/set.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/set.h b/src/shared/set.h index dd4d458792..39a5a495f5 100644 --- a/src/shared/set.h +++ b/src/shared/set.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + /* Pretty straightforward set implementation. Internally based on the * hashmap. That means that as a minor optimization a NULL set * object will be treated as empty set for all read diff --git a/src/shared/strbuf.c b/src/shared/strbuf.c index 189b01a81a..fa102c6e94 100644 --- a/src/shared/strbuf.c +++ b/src/shared/strbuf.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2012 Kay Sievers diff --git a/src/shared/strbuf.h b/src/shared/strbuf.h index 2347fd4328..7b22de79fd 100644 --- a/src/shared/strbuf.h +++ b/src/shared/strbuf.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2012 Kay Sievers @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include #include #include diff --git a/src/shared/strv.c b/src/shared/strv.c index da8ea8a0a6..7c43f256d3 100644 --- a/src/shared/strv.c +++ b/src/shared/strv.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering diff --git a/src/shared/strv.h b/src/shared/strv.h index 98e339c02f..6e0c7655d9 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2010 Lennart Poettering @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include #include diff --git a/src/shared/strxcpyx.c b/src/shared/strxcpyx.c index 6efa237d4b..6de44be9a1 100644 --- a/src/shared/strxcpyx.c +++ b/src/shared/strxcpyx.c @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** This file is part of eudev from systemd diff --git a/src/shared/strxcpyx.h b/src/shared/strxcpyx.h index e3450311df..01d0ac7dd2 100644 --- a/src/shared/strxcpyx.h +++ b/src/shared/strxcpyx.h @@ -1,7 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** This file is part of eudev from systemd. @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include #include diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h index 5f09ce181f..e1dec0b1b4 100644 --- a/src/shared/udev-util.h +++ b/src/shared/udev-util.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2013 Zbigniew Jędrzejewski-Szmek @@ -21,6 +17,8 @@ along with systemd; If not, see . ***/ +#pragma once + #include "udev.h" #include "util.h" diff --git a/src/shared/virt.c b/src/shared/virt.c index 92ca4ec883..4b1e8c62e0 100644 --- a/src/shared/virt.c +++ b/src/shared/virt.c @@ -1,7 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2011 Lennart Poettering diff --git a/src/shared/virt.h b/src/shared/virt.h index 571f3a71de..d3ffc5385f 100644 --- a/src/shared/virt.h +++ b/src/shared/virt.h @@ -1,9 +1,5 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - /*** - This file is part of systemd. + This file is part of eudev, forked from systemd. Copyright 2011 Lennart Poettering @@ -21,4 +17,6 @@ along with systemd; If not, see . ***/ +#pragma once + int detect_container(const char **id); -- cgit v1.2.3-54-g00ecf