summaryrefslogtreecommitdiffstats
path: root/src/plist.c
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2021-12-23 03:09:07 +0100
committerGravatar Nikias Bassen2021-12-23 03:09:07 +0100
commit429cbc660ae14d4998715803b44c71abf0e4a339 (patch)
tree12fe08f5dcb00a380536198bac3fffd4eb7dd19b /src/plist.c
parent70002721443dabaa99b56301b537980e137b6249 (diff)
downloadlibplist-429cbc660ae14d4998715803b44c71abf0e4a339.tar.gz
libplist-429cbc660ae14d4998715803b44c71abf0e4a339.tar.bz2
Add support for JSON format
Diffstat (limited to 'src/plist.c')
-rw-r--r--src/plist.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plist.c b/src/plist.c
index 61b2913..9f3c8f4 100644
--- a/src/plist.c
+++ b/src/plist.c
@@ -49,17 +49,21 @@ extern void plist_xml_init(void);
49extern void plist_xml_deinit(void); 49extern void plist_xml_deinit(void);
50extern void plist_bin_init(void); 50extern void plist_bin_init(void);
51extern void plist_bin_deinit(void); 51extern void plist_bin_deinit(void);
52extern void plist_json_init(void);
53extern void plist_json_deinit(void);
52 54
53static void internal_plist_init(void) 55static void internal_plist_init(void)
54{ 56{
55 plist_bin_init(); 57 plist_bin_init();
56 plist_xml_init(); 58 plist_xml_init();
59 plist_json_init();
57} 60}
58 61
59static void internal_plist_deinit(void) 62static void internal_plist_deinit(void)
60{ 63{
61 plist_bin_deinit(); 64 plist_bin_deinit();
62 plist_xml_deinit(); 65 plist_xml_deinit();
66 plist_json_deinit();
63} 67}
64 68
65#ifdef WIN32 69#ifdef WIN32
@@ -195,6 +199,8 @@ PLIST_API plist_err_t plist_from_memory(const char *plist_data, uint32_t length,
195 } 199 }
196 if (plist_is_binary(plist_data, length)) { 200 if (plist_is_binary(plist_data, length)) {
197 res = plist_from_bin(plist_data, length, plist); 201 res = plist_from_bin(plist_data, length, plist);
202 } else if (plist_data[0] == '[' || plist_data[0] == '{') {
203 res = plist_from_json(plist_data, length, plist);
198 } else { 204 } else {
199 res = plist_from_xml(plist_data, length, plist); 205 res = plist_from_xml(plist_data, length, plist);
200 } 206 }