picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

util-lib: split out printf() helpers to stdio-util.h

This commit is contained in:
Lennart Poettering 2015-10-27 01:26:31 +01:00
parent c7f1808add
commit 15a5e95075
28 changed files with 114 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -766,6 +766,7 @@ libbasic_la_SOURCES = \
src/basic/capability-util.h \
src/basic/conf-files.c \
src/basic/conf-files.h \
src/basic/stdio-util.h \
src/basic/hostname-util.h \
src/basic/hostname-util.c \
src/basic/unit-name.c \

1
src/basic/log.c
View File

@ -42,6 +42,7 @@
#include "process-util.h"
#include "signal-util.h"
#include "socket-util.h"
#include "stdio-util.h"
#include "string-table.h"
#include "string-util.h"
#include "syslog-util.h"

45
src/basic/macro.h
View File

@ -301,51 +301,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
#define char_array_0(x) x[sizeof(x)-1] = 0;
#define VA_FORMAT_ADVANCE(format, ap) \
do { \
int _argtypes[128]; \
size_t _i, _k; \
_k = parse_printf_format((format), ELEMENTSOF(_argtypes), _argtypes); \
assert(_k < ELEMENTSOF(_argtypes)); \
for (_i = 0; _i < _k; _i++) { \
if (_argtypes[_i] & PA_FLAG_PTR) { \
(void) va_arg(ap, void*); \
continue; \
} \
\
switch (_argtypes[_i]) { \
case PA_INT: \
case PA_INT|PA_FLAG_SHORT: \
case PA_CHAR: \
(void) va_arg(ap, int); \
break; \
case PA_INT|PA_FLAG_LONG: \
(void) va_arg(ap, long int); \
break; \
case PA_INT|PA_FLAG_LONG_LONG: \
(void) va_arg(ap, long long int); \
break; \
case PA_WCHAR: \
(void) va_arg(ap, wchar_t); \
break; \
case PA_WSTRING: \
case PA_STRING: \
case PA_POINTER: \
(void) va_arg(ap, void*); \
break; \
case PA_FLOAT: \
case PA_DOUBLE: \
(void) va_arg(ap, double); \
break; \
case PA_DOUBLE|PA_FLAG_LONG_DOUBLE: \
(void) va_arg(ap, long double); \
break; \
default: \
assert_not_reached("Unknown format string argument."); \
} \
} \
} while(false)
/* Because statfs.t_type can be int on some architectures, we have to cast
* the const magic to the type, otherwise the compiler warns about
* signed/unsigned comparison, because the magic can be 32 bit unsigned.

1
src/basic/mount-util.c
View File

@ -30,6 +30,7 @@
#include "parse-util.h"
#include "path-util.h"
#include "set.h"
#include "stdio-util.h"
#include "string-util.h"
#include "util.h"

78
src/basic/stdio-util.h Normal file
View File

@ -0,0 +1,78 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2010 Lennart Poettering
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 <http://www.gnu.org/licenses/>.
***/
#include <printf.h>
#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include "macro.h"
#define xsprintf(buf, fmt, ...) \
assert_message_se((size_t) snprintf(buf, ELEMENTSOF(buf), fmt, __VA_ARGS__) < ELEMENTSOF(buf), "xsprintf: " #buf "[] must be big enough")
#define VA_FORMAT_ADVANCE(format, ap) \
do { \
int _argtypes[128]; \
size_t _i, _k; \
_k = parse_printf_format((format), ELEMENTSOF(_argtypes), _argtypes); \
assert(_k < ELEMENTSOF(_argtypes)); \
for (_i = 0; _i < _k; _i++) { \
if (_argtypes[_i] & PA_FLAG_PTR) { \
(void) va_arg(ap, void*); \
continue; \
} \
\
switch (_argtypes[_i]) { \
case PA_INT: \
case PA_INT|PA_FLAG_SHORT: \
case PA_CHAR: \
(void) va_arg(ap, int); \
break; \
case PA_INT|PA_FLAG_LONG: \
(void) va_arg(ap, long int); \
break; \
case PA_INT|PA_FLAG_LONG_LONG: \
(void) va_arg(ap, long long int); \
break; \
case PA_WCHAR: \
(void) va_arg(ap, wchar_t); \
break; \
case PA_WSTRING: \
case PA_STRING: \
case PA_POINTER: \
(void) va_arg(ap, void*); \
break; \
case PA_FLOAT: \
case PA_DOUBLE: \
(void) va_arg(ap, double); \
break; \
case PA_DOUBLE|PA_FLAG_LONG_DOUBLE: \
(void) va_arg(ap, long double); \
break; \
default: \
assert_not_reached("Unknown format string argument."); \
} \
} \
} while(false)

4
src/basic/util.h
View File

@ -85,10 +85,6 @@ static inline const char* one_zero(bool b) {
bool fstype_is_network(const char *fstype);
#define xsprintf(buf, fmt, ...) \
assert_message_se((size_t) snprintf(buf, ELEMENTSOF(buf), fmt, __VA_ARGS__) < ELEMENTSOF(buf), \
"xsprintf: " #buf "[] must be big enough")
noreturn void freeze(void);
void execute_directories(const char* const* directories, usec_t timeout, char *argv[]);

1
src/basic/xattr-util.c
View File

@ -23,6 +23,7 @@
#include "fd-util.h"
#include "sparse-endian.h"
#include "stdio-util.h"
#include "util.h"
#include "xattr-util.h"

1
src/core/automount.c
View File

@ -45,6 +45,7 @@
#include "path-util.h"
#include "process-util.h"
#include "special.h"
#include "stdio-util.h"
#include "string-table.h"
#include "string-util.h"
#include "unit-name.h"

1
src/core/main.c
View File

@ -78,6 +78,7 @@
#include "smack-setup.h"
#include "special.h"
#include "stat-util.h"
#include "stdio-util.h"
#include "strv.h"
#include "switch-root.h"
#include "terminal-util.h"

12
src/core/selinux-access.c
View File

@ -32,13 +32,15 @@
#endif
#include "sd-bus.h"
#include "bus-util.h"
#include "util.h"
#include "log.h"
#include "selinux-util.h"
#include "audit-fd.h"
#include "strv.h"
#include "bus-util.h"
#include "log.h"
#include "path-util.h"
#include "selinux-util.h"
#include "stdio-util.h"
#include "strv.h"
#include "util.h"
static bool initialized = false;

1
src/fsck/fsck.c
View File

@ -45,6 +45,7 @@
#include "signal-util.h"
#include "socket-util.h"
#include "special.h"
#include "stdio-util.h"
#include "util.h"
/* exit codes as defined in fsck(8) */

1
src/journal-remote/journal-remote.c
View File

@ -48,6 +48,7 @@
#include "signal-util.h"
#include "socket-util.h"
#include "stat-util.h"
#include "stdio-util.h"
#include "string-table.h"
#include "string-util.h"
#include "strv.h"

1
src/journal/journal-send.c
View File

@ -36,6 +36,7 @@
#include "io-util.h"
#include "memfd-util.h"
#include "socket-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "util.h"

1
src/journal/journald-console.c
View File

@ -31,6 +31,7 @@
#include "journald-server.h"
#include "parse-util.h"
#include "process-util.h"
#include "stdio-util.h"
#include "terminal-util.h"
static bool prefix_timestamp(void) {

1
src/journal/journald-kmsg.c
View File

@ -37,6 +37,7 @@
#include "journald-syslog.h"
#include "parse-util.h"
#include "process-util.h"
#include "stdio-util.h"
#include "string-util.h"
void server_forward_kmsg(

1
src/journal/journald-stream.c
View File

@ -44,6 +44,7 @@
#include "parse-util.h"
#include "selinux-util.h"
#include "socket-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "syslog-util.h"

1
src/journal/journald-syslog.c
View File

@ -36,6 +36,7 @@
#include "process-util.h"
#include "selinux-util.h"
#include "socket-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "syslog-util.h"

2
src/journal/sd-journal.c
View File

@ -47,6 +47,8 @@
#include "missing.h"
#include "path-util.h"
#include "replace-var.h"
#include "stat-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"

1
src/libsystemd/sd-bus/bus-control.c
View File

@ -34,6 +34,7 @@
#include "bus-message.h"
#include "bus-util.h"
#include "capability-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
#include "user-util.h"

3
src/libsystemd/sd-bus/bus-socket.c
View File

@ -32,10 +32,11 @@
#include "bus-socket.h"
#include "fd-util.h"
#include "formats-util.h"
#include "hexdecoct.h"
#include "macro.h"
#include "missing.h"
#include "hexdecoct.h"
#include "signal-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "user-util.h"
#include "utf8.h"

1
src/machine/machined-dbus.c
View File

@ -39,6 +39,7 @@
#include "machined.h"
#include "path-util.h"
#include "process-util.h"
#include "stdio-util.h"
#include "strv.h"
#include "unit-name.h"
#include "user-util.h"

1
src/network/networkd-link.c
View File

@ -33,6 +33,7 @@
#include "networkd-netdev.h"
#include "set.h"
#include "socket-util.h"
#include "stdio-util.h"
#include "string-table.h"
#include "udev-util.h"
#include "util.h"

1
src/nspawn/nspawn.c
View File

@ -91,6 +91,7 @@
#include "signal-util.h"
#include "socket-util.h"
#include "stat-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
#include "terminal-util.h"

1
src/shared/bus-util.c
View File

@ -43,6 +43,7 @@
#include "rlimit-util.h"
#include "set.h"
#include "signal-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "strv.h"
#include "syslog-util.h"

1
src/shared/efivars.c
View File

@ -28,6 +28,7 @@
#include "fd-util.h"
#include "io-util.h"
#include "parse-util.h"
#include "stdio-util.h"
#include "utf8.h"
#include "util.h"
#include "virt.h"

6
src/shared/spawn-polkit-agent.c
View File

@ -30,6 +30,7 @@
#include "log.h"
#include "process-util.h"
#include "spawn-polkit-agent.h"
#include "stdio-util.h"
#include "util.h"
#ifdef ENABLE_POLKIT
@ -78,8 +79,9 @@ void polkit_agent_close(void) {
return;
/* Inform agent that we are done */
kill(agent_pid, SIGTERM);
kill(agent_pid, SIGCONT);
(void) kill(agent_pid, SIGTERM);
(void) kill(agent_pid, SIGCONT);
(void) wait_for_terminate(agent_pid, NULL);
agent_pid = 0;
}

1
src/tmpfiles/tmpfiles.c
View File

@ -62,6 +62,7 @@
#include "set.h"
#include "specifier.h"
#include "stat-util.h"
#include "stdio-util.h"
#include "string-table.h"
#include "string-util.h"
#include "strv.h"

1
src/udev/udev-builtin-keyboard.c
View File

@ -25,6 +25,7 @@
#include "fd-util.h"
#include "parse-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "udev.h"