dbus-broker/backport-launch-config-avoid-expat.h-in-header.patch
hongjinghao bc85f6a4e5 sync patches from dbus-broker community
(cherry picked from commit 58716c55dbf25e6fa009b35703a1792e10895951)
2023-08-09 11:24:07 +08:00

43 lines
1.1 KiB
Diff

From c2f07184beddb26d7e62c4c32d6503ad47830152 Mon Sep 17 00:00:00 2001
From: David Rheinsberg <david@readahead.eu>
Date: Wed, 5 Jul 2023 09:41:11 +0200
Subject: [PATCH] launch/config: avoid expat.h in header
To reduce exposure of expat, avoid it in config.h. The only definition
we use can be easily forward-declared, and thus we can completely
contain expat in config.c.
Signed-off-by: David Rheinsberg <david@readahead.eu>
---
src/launch/config.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/launch/config.h b/src/launch/config.h
index c36819d..881974a 100644
--- a/src/launch/config.h
+++ b/src/launch/config.h
@@ -6,9 +6,10 @@
#include <c-list.h>
#include <c-stdaux.h>
-#include <expat.h>
#include <stdlib.h>
+struct XML_ParserStruct;
+
typedef struct ConfigPath ConfigPath;
typedef struct ConfigNode ConfigNode;
typedef struct ConfigParser ConfigParser;
@@ -218,7 +219,7 @@ struct ConfigRoot {
}
struct ConfigParser {
- XML_Parser xml;
+ struct XML_ParserStruct *xml;
struct ConfigState {
NSSCache *nss;
--
2.33.0