diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2014-08-14 18:26:38 -0400 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2014-08-14 18:36:15 -0400 |
commit | 6328540098383b453ed265576fdbadd3049b2963 (patch) | |
tree | 787f87efef9145114d3602b71a9afe8c506e2611 | |
parent | src/shared: import more code cleanups from upstream (diff) | |
download | eudev-6328540098383b453ed265576fdbadd3049b2963.tar.gz eudev-6328540098383b453ed265576fdbadd3049b2963.tar.bz2 eudev-6328540098383b453ed265576fdbadd3049b2963.zip |
src/shared: some stylistic changes
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
37 files changed, 67 insertions, 134 deletions
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index 34582a7eb..76ab74729 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 11e7308e1..5c219b204 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include <sys/types.h> #include <stdio.h> #include <dirent.h> diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c index 2de4fe0a3..6675a1c26 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 b769e5684..9436290f4 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 <http://www.gnu.org/licenses/>. ***/ +#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 d4844f418..f3c3bfde1 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 <http://www.gnu.org/licenses/>. ***/ +#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 1a565d547..8199a26f7 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 d41b6eefb..0adea22a9 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + int dev_setup(const char *pathprefix); diff --git a/src/shared/device-nodes.c b/src/shared/device-nodes.c index e235de83e..658d3eaec 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 57ed97d32..d27ac0906 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 79bb8ca98..78616e659 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 e2570c65d..5c726edac 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include "set.h" typedef struct ExitStatusSet { diff --git a/src/shared/fileio.h b/src/shared/fileio.h index d29e2dfa0..641bf0230 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 <http://www.gnu.org/licenses/>. ***/ + #include <stddef.h> #include <stdio.h> diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c index b92c83202..38dce1192 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 cfd34750d..b739262ab 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include <stdbool.h> #include "macro.h" diff --git a/src/shared/label.c b/src/shared/label.c index eb95c3169..3c6277a3a 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 ec64fa681..592ef607c 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include <sys/types.h> #include <stdbool.h> #include <sys/socket.h> diff --git a/src/shared/log.c b/src/shared/log.c index 56aa4e14d..af6a98308 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 1b2a67a03..70d3ec2f6 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include <stdbool.h> #include <stdarg.h> #include <syslog.h> diff --git a/src/shared/macro.h b/src/shared/macro.h index 3e02d86b5..112e90196 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include <assert.h> #include <sys/param.h> #include <sys/types.h> diff --git a/src/shared/missing.h b/src/shared/missing.h index 2cb12786b..572e17117 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + /* Missing glibc definitions to access certain kernel APIs */ #include <sys/resource.h> diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c index 073ecab7b..df501046d 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 874433dc9..e1e7f82a1 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 399f2c0ff..bd7e2bcfe 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 <http://www.gnu.org/licenses/>. ***/ +#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 2a2f33dbc..aa439af90 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 16c74a4ac..85e4bc00b 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 b5b8faa06..3bcd17ce7 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 3a4f7d049..8b89d45cc 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 dd4d45879..39a5a495f 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 <http://www.gnu.org/licenses/>. ***/ +#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 189b01a81..fa102c6e9 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 <kay@vrfy.org> diff --git a/src/shared/strbuf.h b/src/shared/strbuf.h index 2347fd432..7b22de79f 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 <kay@vrfy.org> @@ -21,6 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include <stdarg.h> #include <stdint.h> #include <stdbool.h> diff --git a/src/shared/strv.c b/src/shared/strv.c index da8ea8a0a..7c43f256d 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 98e339c02..6e0c7655d 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include <stdarg.h> #include <stdbool.h> diff --git a/src/shared/strxcpyx.c b/src/shared/strxcpyx.c index 6efa237d4..6de44be9a 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 e3450311d..01d0ac7dd 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include <stdarg.h> #include <stdbool.h> diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h index 5f09ce181..e1dec0b1b 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + #include "udev.h" #include "util.h" diff --git a/src/shared/virt.c b/src/shared/virt.c index 92ca4ec88..4b1e8c62e 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 571f3a71d..d3ffc5385 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 <http://www.gnu.org/licenses/>. ***/ +#pragma once + int detect_container(const char **id); |