From 6482f6269c87d2249e52e889a63adbdd50f2d691 Mon Sep 17 00:00:00 2001 From: Ronny Chevalier Date: Fri, 10 Apr 2015 20:43:52 +0200 Subject: shared: add formats-util.h --- src/shared/ask-password-api.c | 1 + src/shared/cgroup-show.c | 1 + src/shared/cgroup-util.c | 1 + src/shared/clean-ipc.c | 1 + src/shared/formats-util.h | 63 +++++++++++++++++++++++++++++++++++++++++++ src/shared/install-printf.c | 1 + src/shared/log.c | 1 + src/shared/logs-show.c | 1 + src/shared/socket-util.c | 1 + src/shared/util.c | 1 + src/shared/util.h | 42 +---------------------------- 11 files changed, 73 insertions(+), 41 deletions(-) create mode 100644 src/shared/formats-util.h (limited to 'src/shared') diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 44ebc58491..dfc89d23fd 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -32,6 +32,7 @@ #include #include "util.h" +#include "formats-util.h" #include "mkdir.h" #include "strv.h" diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c index cbd94e86d9..fed72ac175 100644 --- a/src/shared/cgroup-show.c +++ b/src/shared/cgroup-show.c @@ -25,6 +25,7 @@ #include #include "util.h" +#include "formats-util.h" #include "macro.h" #include "path-util.h" #include "cgroup-util.h" diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index b6fa386e90..481708f19e 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -33,6 +33,7 @@ #include "set.h" #include "macro.h" #include "util.h" +#include "formats-util.h" #include "path-util.h" #include "unit-name.h" #include "fileio.h" diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c index ea781f5dea..48b10865da 100644 --- a/src/shared/clean-ipc.c +++ b/src/shared/clean-ipc.c @@ -29,6 +29,7 @@ #include #include "util.h" +#include "formats-util.h" #include "strv.h" #include "clean-ipc.h" diff --git a/src/shared/formats-util.h b/src/shared/formats-util.h new file mode 100644 index 0000000000..ce516b117d --- /dev/null +++ b/src/shared/formats-util.h @@ -0,0 +1,63 @@ +#pragma once + +/*** + This file is part of systemd. + + Copyright 2015 Ronny Chevalier + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +#include + +#if SIZEOF_PID_T == 4 +# define PID_PRI PRIi32 +#elif SIZEOF_PID_T == 2 +# define PID_PRI PRIi16 +#else +# error Unknown pid_t size +#endif +#define PID_FMT "%" PID_PRI + +#if SIZEOF_UID_T == 4 +# define UID_FMT "%" PRIu32 +#elif SIZEOF_UID_T == 2 +# define UID_FMT "%" PRIu16 +#else +# error Unknown uid_t size +#endif + +#if SIZEOF_GID_T == 4 +# define GID_FMT "%" PRIu32 +#elif SIZEOF_GID_T == 2 +# define GID_FMT "%" PRIu16 +#else +# error Unknown gid_t size +#endif + +#if SIZEOF_TIME_T == 8 +# define PRI_TIME PRIi64 +#elif SIZEOF_TIME_T == 4 +# define PRI_TIME PRIu32 +#else +# error Unknown time_t size +#endif + +#if SIZEOF_RLIM_T == 8 +# define RLIM_FMT "%" PRIu64 +#elif SIZEOF_RLIM_T == 4 +# define RLIM_FMT "%" PRIu32 +#else +# error Unknown rlim_t size +#endif diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c index f62a0321e6..9996649424 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -25,6 +25,7 @@ #include "unit-name.h" #include "util.h" #include "install-printf.h" +#include "formats-util.h" static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) { InstallInfo *i = userdata; diff --git a/src/shared/log.c b/src/shared/log.c index 646a1d6389..32ec581d8d 100644 --- a/src/shared/log.c +++ b/src/shared/log.c @@ -34,6 +34,7 @@ #include "missing.h" #include "macro.h" #include "socket-util.h" +#include "formats-util.h" #define SNDBUF_SIZE (8*1024*1024) diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index 4e1b87814b..e179b8a7b4 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -31,6 +31,7 @@ #include "utf8.h" #include "hashmap.h" #include "journal-internal.h" +#include "formats-util.h" /* up to three lines (each up to 100 characters), or 300 characters, whichever is less */ diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c index 4a6bf50b17..94a0663345 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -35,6 +35,7 @@ #include "socket-util.h" #include "missing.h" #include "fileio.h" +#include "formats-util.h" int socket_address_parse(SocketAddress *a, const char *s) { char *e, *n; diff --git a/src/shared/util.c b/src/shared/util.c index df5f8d1088..7321f1bcbb 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -92,6 +92,7 @@ #include "virt.h" #include "def.h" #include "sparse-endian.h" +#include "formats-util.h" /* Put this test here for a lack of better place */ assert_cc(EAGAIN == EWOULDBLOCK); diff --git a/src/shared/util.h b/src/shared/util.h index 56e11c7961..d17b987f33 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -43,50 +43,10 @@ #include #include -#if SIZEOF_PID_T == 4 -# define PID_PRI PRIi32 -#elif SIZEOF_PID_T == 2 -# define PID_PRI PRIi16 -#else -# error Unknown pid_t size -#endif -#define PID_FMT "%" PID_PRI - -#if SIZEOF_UID_T == 4 -# define UID_FMT "%" PRIu32 -#elif SIZEOF_UID_T == 2 -# define UID_FMT "%" PRIu16 -#else -# error Unknown uid_t size -#endif - -#if SIZEOF_GID_T == 4 -# define GID_FMT "%" PRIu32 -#elif SIZEOF_GID_T == 2 -# define GID_FMT "%" PRIu16 -#else -# error Unknown gid_t size -#endif - -#if SIZEOF_TIME_T == 8 -# define PRI_TIME PRIi64 -#elif SIZEOF_TIME_T == 4 -# define PRI_TIME PRIu32 -#else -# error Unknown time_t size -#endif - -#if SIZEOF_RLIM_T == 8 -# define RLIM_FMT "%" PRIu64 -#elif SIZEOF_RLIM_T == 4 -# define RLIM_FMT "%" PRIu32 -#else -# error Unknown rlim_t size -#endif - #include "macro.h" #include "missing.h" #include "time-util.h" +#include "formats-util.h" /* What is interpreted as whitespace? */ #define WHITESPACE " \t\n\r" -- cgit v1.2.3-54-g00ecf