diff options
author | Simon McVittie <smcv@collabora.com> | 2022-07-19 20:37:19 +0100 |
---|---|---|
committer | Simon McVittie <smcv@collabora.com> | 2022-07-19 20:50:33 +0100 |
commit | a54ed9ffadcbb2bceebdfb5797e38d49c26289eb (patch) | |
tree | 4c83b9174c2bd4cf106ef2e7e9c2f6a74b6d2e75 /dbus/dbus-sysdeps-unix.c | |
parent | bf30fe6d6068bd00ff4b06e667f88e7ca4210cfe (diff) | |
download | dbus-a54ed9ffadcbb2bceebdfb5797e38d49c26289eb.tar.gz |
Remove emulation of va_copy() in non-C99 compilers
dbus now requires a (mostly-)C99 compiler, which guarantees the presence
of Standard C va_copy().
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'dbus/dbus-sysdeps-unix.c')
-rw-r--r-- | dbus/dbus-sysdeps-unix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 18bd1282..252798e3 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -3825,7 +3825,7 @@ _dbus_printf_string_upper_bound (const char *format, int len; va_list args_copy; - DBUS_VA_COPY (args_copy, args); + va_copy (args_copy, args); len = vsnprintf (static_buf, bufsize, format, args_copy); va_end (args_copy); @@ -3843,7 +3843,7 @@ _dbus_printf_string_upper_bound (const char *format, * or the real length could be coincidentally the same. Which is it? * If vsnprintf returns the truncated length, we'll go to the slow * path. */ - DBUS_VA_COPY (args_copy, args); + va_copy (args_copy, args); if (vsnprintf (static_buf, 1, format, args_copy) == 1) len = -1; @@ -3864,7 +3864,7 @@ _dbus_printf_string_upper_bound (const char *format, if (buf == NULL) return -1; - DBUS_VA_COPY (args_copy, args); + va_copy (args_copy, args); len = vsnprintf (buf, bufsize, format, args_copy); va_end (args_copy); @@ -5097,7 +5097,7 @@ _dbus_logv (DBusSystemLogSeverity severity, _dbus_assert_not_reached ("invalid log severity"); } - DBUS_VA_COPY (tmp, args); + va_copy (tmp, args); vsyslog (flags, msg, tmp); va_end (tmp); } @@ -5107,7 +5107,7 @@ _dbus_logv (DBusSystemLogSeverity severity, if (log_flags & DBUS_LOG_FLAGS_STDERR) #endif { - DBUS_VA_COPY (tmp, args); + va_copy (tmp, args); fprintf (stderr, "%s[" DBUS_PID_FORMAT "]: ", syslog_tag, _dbus_getpid ()); vfprintf (stderr, msg, tmp); fputc ('\n', stderr); |