External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

src: ensure use of g_printf / g_fprintf functions

Browse Source 
The printf/fprintf function impls provided on Windows do
not follow the normal syntax for format specifiers as
the UNIX hosts. Currently we use GNULIB to provide a
portability fix for this. GLib has also imported the
GNULIB impl for this same reason, and thus we can rely
on the g_printf / g_fprintf functions.

This identified a couple of places not explicitly
linking to glib.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-01-27 13:58:51 +00:00
parent b9103e62e4
commit 11a79283b8
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/internal.h
View File

@ -488,3 +488,17 @@ enum {
# define ENOMSG 122
# endif
#endif
/* Ideally callers would use the g_*printf
* functions directly but there are alot to
* convert, so until then...
*/
#ifndef VIR_NO_GLIB_STDIO
# undef printf
# define printf(...) g_printf(__VA_ARGS__)
# undef fprintf
# define fprintf(fh, ...) g_fprintf(fh, __VA_ARGS__)
#endif /* VIR_NO_GLIB_STDIO */

5
src/locking/Makefile.inc.am
View File

@ -208,7 +208,10 @@ libvirt_sanlock_helper_LDFLAGS = \
$(AM_LDFLAGS) \
$(PIE_LDFLAGS) \
$(NULL)
libvirt_sanlock_helper_LDADD = libvirt.la
libvirt_sanlock_helper_LDADD = \
libvirt.la \
$(GLIB_LIBS) \
$(NULL)
endif WITH_SANLOCK
conf_DATA += locking/virtlockd.conf