From: Laine Stump <laine@redhat.com> For some reason there were some uses of this struct where "struct _virLogMetadata" was used instead of just using the typedef "virLogMetadata" (they are both defined in the same file - virlog.h). Possibly at one point the struct was in virlog.c and outsiders could only see it as an opaque object, but even if that was the case, there are already cases of the typedef being used outside of virlog.c, and constinuing to use "struct _virLogMetadata" in some places both looks too much K&R 1st edition and might incorrectly imply to someone that there *is* data abstraction/hiding going on when there really isn't. So let's just always use plain virLogMetadata. Signed-off-by: Laine Stump <laine@redhat.com> --- src/util/virlog.c | 12 ++++++------ src/util/virlog.h | 4 ++-- tests/testutils.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 9f53c72975..30cb68fe7d 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -116,7 +116,7 @@ static void virLogOutputToFd(virLogSource *src, int linenr, const char *funcname, const char *timestamp, - struct _virLogMetadata *metadata, + virLogMetadata *metadata, const char *rawstr, const char *str, void *data); @@ -500,7 +500,7 @@ virLogVMessage(virLogSource *source, const char *filename, int linenr, const char *funcname, - struct _virLogMetadata *metadata, + virLogMetadata *metadata, const char *fmt, va_list vargs) { @@ -627,7 +627,7 @@ virLogMessage(virLogSource *source, const char *filename, int linenr, const char *funcname, - struct _virLogMetadata *metadata, + virLogMetadata *metadata, const char *fmt, ...) { va_list ap; @@ -646,7 +646,7 @@ virLogOutputToFd(virLogSource *source G_GNUC_UNUSED, int linenr G_GNUC_UNUSED, const char *funcname G_GNUC_UNUSED, const char *timestamp, - struct _virLogMetadata *metadata G_GNUC_UNUSED, + virLogMetadata *metadata G_GNUC_UNUSED, const char *rawstr G_GNUC_UNUSED, const char *str, void *data) @@ -746,7 +746,7 @@ virLogOutputToSyslog(virLogSource *source G_GNUC_UNUSED, int linenr G_GNUC_UNUSED, const char *funcname G_GNUC_UNUSED, const char *timestamp G_GNUC_UNUSED, - struct _virLogMetadata *metadata G_GNUC_UNUSED, + virLogMetadata *metadata G_GNUC_UNUSED, const char *rawstr G_GNUC_UNUSED, const char *str, void *data G_GNUC_UNUSED) @@ -890,7 +890,7 @@ virLogOutputToJournald(virLogSource *source, int linenr, const char *funcname, const char *timestamp G_GNUC_UNUSED, - struct _virLogMetadata *metadata, + virLogMetadata *metadata, const char *rawstr, const char *str G_GNUC_UNUSED, void *data) diff --git a/src/util/virlog.h b/src/util/virlog.h index 4f755c543b..77ba40b2e4 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -127,7 +127,7 @@ typedef void (*virLogOutputFunc) (virLogSource *src, int linenr, const char *funcname, const char *timestamp, - struct _virLogMetadata *metadata, + virLogMetadata *metadata, const char *rawstr, const char *str, void *data); @@ -170,7 +170,7 @@ void virLogMessage(virLogSource *source, const char *filename, int linenr, const char *funcname, - struct _virLogMetadata *metadata, + virLogMetadata *metadata, const char *fmt, ...) G_GNUC_PRINTF(7, 8); bool virLogProbablyLogMessage(const char *str); diff --git a/tests/testutils.c b/tests/testutils.c index 14e5c56fcf..35571fb2ad 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -680,7 +680,7 @@ virtTestLogOutput(virLogSource *source G_GNUC_UNUSED, int lineno G_GNUC_UNUSED, const char *funcname G_GNUC_UNUSED, const char *timestamp, - struct _virLogMetadata *metadata G_GNUC_UNUSED, + virLogMetadata *metadata G_GNUC_UNUSED, const char *rawstr G_GNUC_UNUSED, const char *str, void *data) -- 2.53.0