diff options
| -rw-r--r-- | src/bplist.c | 4 | ||||
| -rw-r--r-- | src/plist.c | 6 | ||||
| -rw-r--r-- | src/plist.h | 3 | ||||
| -rw-r--r-- | src/xplist.c | 8 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/bplist.c b/src/bplist.c index 0140f88..78bbe4a 100644 --- a/src/bplist.c +++ b/src/bplist.c @@ -20,11 +20,13 @@ */ -#include "plist.h" #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <plist/plist.h> +#include "plist.h" + /* Magic marker and size. */ #define BPLIST_MAGIC ((uint8_t*)"bplist") #define BPLIST_MAGIC_SIZE 6 diff --git a/src/plist.c b/src/plist.c index 5fc2338..f315e7e 100644 --- a/src/plist.c +++ b/src/plist.c @@ -71,7 +71,7 @@ plist_t plist_new_array() return plist_new_node(data); } -plist_t plist_add_sub_element(plist_t node, plist_type type, const void *value, uint64_t length) +static plist_t plist_add_sub_element(plist_t node, plist_type type, const void *value, uint64_t length) { //only structured types can have children plist_type node_type = plist_get_node_type(node); @@ -172,7 +172,7 @@ static char compare_node_value(plist_type type, plist_data_t data, const void *v return res; } -plist_t plist_find_node(plist_t plist, plist_type type, const void *value, uint64_t length) +static plist_t plist_find_node(plist_t plist, plist_type type, const void *value, uint64_t length) { if (!plist) return NULL; @@ -204,7 +204,7 @@ plist_t plist_find_node_by_string(plist_t plist, const char *value) return plist_find_node(plist, PLIST_STRING, value, strlen(value)); } -void plist_get_type_and_value(plist_t node, plist_type * type, void *value, uint64_t * length) +static void plist_get_type_and_value(plist_t node, plist_type * type, void *value, uint64_t * length) { if (!node) return; diff --git a/src/plist.h b/src/plist.h index 7596992..33f6c20 100644 --- a/src/plist.h +++ b/src/plist.h @@ -56,8 +56,5 @@ plist_data_t plist_get_data(const plist_t node); plist_data_t plist_new_plist_data(); void plist_free_plist_data(plist_data_t node); -plist_t plist_add_sub_element( plist_t node, plist_type type, const void* value, uint64_t length); -plist_t plist_find_node(plist_t plist, plist_type type, const void *value, uint64_t length); -void plist_get_type_and_value(plist_t node, plist_type * type, void *value, uint64_t * length); #endif diff --git a/src/xplist.c b/src/xplist.c index e61797c..f9670f1 100644 --- a/src/xplist.c +++ b/src/xplist.c @@ -22,8 +22,6 @@ #include <string.h> #include <assert.h> -#include "utils.h" -#include "plist.h" #include <stdlib.h> #include <stdio.h> @@ -31,6 +29,10 @@ #include <libxml/parser.h> #include <libxml/tree.h> +#include <plist/plist.h> +#include "utils.h" +#include "plist.h" + #define XPLIST_TEXT BAD_CAST("text") #define XPLIST_KEY BAD_CAST("key") #define XPLIST_FALSE BAD_CAST("false") @@ -43,7 +45,7 @@ #define XPLIST_ARRAY BAD_CAST("array") #define XPLIST_DICT BAD_CAST("dict") -const char *plist_base = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\ +static const char *plist_base = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\ <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n\ <plist version=\"1.0\">\n\ </plist>\0"; |