summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-27 01:26:31 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-27 13:25:57 +0100
commit15a5e95075a7f6007dd97b2a165c8ed16fe683df (patch)
treeda7259ad54e2009c45a10ff4e0acad4160eed3be /src/basic
parentc7f1808add4d971229ba5311cf66e659122aa338 (diff)
util-lib: split out printf() helpers to stdio-util.h
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/log.c1
-rw-r--r--src/basic/macro.h45
-rw-r--r--src/basic/mount-util.c1
-rw-r--r--src/basic/stdio-util.h78
-rw-r--r--src/basic/util.h4
-rw-r--r--src/basic/xattr-util.c1
6 files changed, 81 insertions, 49 deletions
diff --git a/src/basic/log.c b/src/basic/log.c
index 4583cb840f..505c0d072c 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -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"
diff --git a/src/basic/macro.h b/src/basic/macro.h
index 156c16b1c3..acd67feabb 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -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.
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 6b33d43024..24e88babcd 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -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"
diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
new file mode 100644
index 0000000000..b36e8a947e
--- /dev/null
+++ b/src/basic/stdio-util.h
@@ -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)
diff --git a/src/basic/util.h b/src/basic/util.h
index fc73e13fe4..95c7c75b9c 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -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[]);
diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index 35fd1c1616..7351337c6b 100644
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -23,6 +23,7 @@
#include "fd-util.h"
#include "sparse-endian.h"
+#include "stdio-util.h"
#include "util.h"
#include "xattr-util.h"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-10 08:52:53 +0000