From 62813daf2c4aaec675652d9c1131a58dfa634e38 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Fri, 3 Oct 2014 15:39:47 +0200 Subject: Avoid exporting non-public symbols --- include/plist/plist.h | 111 +++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 59 deletions(-) (limited to 'include') diff --git a/include/plist/plist.h b/include/plist/plist.h index 7dbc4ae..c66545a 100644 --- a/include/plist/plist.h +++ b/include/plist/plist.h @@ -39,15 +39,8 @@ extern "C" typedef unsigned __int32 uint32_t; typedef unsigned __int64 uint64_t; -#ifdef plist_EXPORTS - #define PLIST_API __declspec( dllexport ) -#else - #define PLIST_API __declspec( dllimport ) -#endif - #else #include -#define PLIST_API #endif #ifdef __llvm__ @@ -130,7 +123,7 @@ extern "C" * @return the created plist * @sa #plist_type */ - PLIST_API plist_t plist_new_dict(void); + plist_t plist_new_dict(void); /** * Create a new root plist_t type #PLIST_ARRAY @@ -138,7 +131,7 @@ extern "C" * @return the created plist * @sa #plist_type */ - PLIST_API plist_t plist_new_array(void); + plist_t plist_new_array(void); /** * Create a new plist_t type #PLIST_STRING @@ -147,7 +140,7 @@ extern "C" * @return the created item * @sa #plist_type */ - PLIST_API plist_t plist_new_string(const char *val); + plist_t plist_new_string(const char *val); /** * Create a new plist_t type #PLIST_BOOLEAN @@ -156,7 +149,7 @@ extern "C" * @return the created item * @sa #plist_type */ - PLIST_API plist_t plist_new_bool(uint8_t val); + plist_t plist_new_bool(uint8_t val); /** * Create a new plist_t type #PLIST_UINT @@ -165,7 +158,7 @@ extern "C" * @return the created item * @sa #plist_type */ - PLIST_API plist_t plist_new_uint(uint64_t val); + plist_t plist_new_uint(uint64_t val); /** * Create a new plist_t type #PLIST_REAL @@ -174,7 +167,7 @@ extern "C" * @return the created item * @sa #plist_type */ - PLIST_API plist_t plist_new_real(double val); + plist_t plist_new_real(double val); /** * Create a new plist_t type #PLIST_DATA @@ -184,7 +177,7 @@ extern "C" * @return the created item * @sa #plist_type */ - PLIST_API plist_t plist_new_data(const char *val, uint64_t length); + plist_t plist_new_data(const char *val, uint64_t length); /** * Create a new plist_t type #PLIST_DATE @@ -194,7 +187,7 @@ extern "C" * @return the created item * @sa #plist_type */ - PLIST_API plist_t plist_new_date(int32_t sec, int32_t usec); + plist_t plist_new_date(int32_t sec, int32_t usec); /** * Create a new plist_t type #PLIST_UID @@ -203,14 +196,14 @@ extern "C" * @return the created item * @sa #plist_type */ - PLIST_API plist_t plist_new_uid(uint64_t val); + plist_t plist_new_uid(uint64_t val); /** * Destruct a plist_t node and all its children recursively * * @param plist the plist to free */ - PLIST_API void plist_free(plist_t plist); + void plist_free(plist_t plist); /** * Return a copy of passed node and it's children @@ -218,7 +211,7 @@ extern "C" * @param node the plist to copy * @return copied plist */ - PLIST_API plist_t plist_copy(plist_t node); + plist_t plist_copy(plist_t node); /******************************************** @@ -233,7 +226,7 @@ extern "C" * @param node the node of type #PLIST_ARRAY * @return size of the #PLIST_ARRAY node */ - PLIST_API uint32_t plist_array_get_size(plist_t node); + uint32_t plist_array_get_size(plist_t node); /** * Get the nth item in a #PLIST_ARRAY node. @@ -242,7 +235,7 @@ extern "C" * @param n the index of the item to get. Range is [0, array_size[ * @return the nth item or NULL if node is not of type #PLIST_ARRAY */ - PLIST_API plist_t plist_array_get_item(plist_t node, uint32_t n); + plist_t plist_array_get_item(plist_t node, uint32_t n); /** * Get the index of an item. item must be a member of a #PLIST_ARRAY node. @@ -250,7 +243,7 @@ extern "C" * @param node the node * @return the node index */ - PLIST_API uint32_t plist_array_get_item_index(plist_t node); + uint32_t plist_array_get_item_index(plist_t node); /** * Set the nth item in a #PLIST_ARRAY node. @@ -260,7 +253,7 @@ extern "C" * @param item the new item at index n. The array is responsible for freeing item when it is no longer needed. * @param n the index of the item to get. Range is [0, array_size[. Assert if n is not in range. */ - PLIST_API void plist_array_set_item(plist_t node, plist_t item, uint32_t n); + void plist_array_set_item(plist_t node, plist_t item, uint32_t n); /** * Append a new item at the end of a #PLIST_ARRAY node. @@ -268,7 +261,7 @@ extern "C" * @param node the node of type #PLIST_ARRAY * @param item the new item. The array is responsible for freeing item when it is no longer needed. */ - PLIST_API void plist_array_append_item(plist_t node, plist_t item); + void plist_array_append_item(plist_t node, plist_t item); /** * Insert a new item at position n in a #PLIST_ARRAY node. @@ -277,7 +270,7 @@ extern "C" * @param item the new item to insert. The array is responsible for freeing item when it is no longer needed. * @param n The position at which the node will be stored. Range is [0, array_size[. Assert if n is not in range. */ - PLIST_API void plist_array_insert_item(plist_t node, plist_t item, uint32_t n); + void plist_array_insert_item(plist_t node, plist_t item, uint32_t n); /** * Remove an existing position in a #PLIST_ARRAY node. @@ -286,7 +279,7 @@ extern "C" * @param node the node of type #PLIST_ARRAY * @param n The position to remove. Range is [0, array_size[. Assert if n is not in range. */ - PLIST_API void plist_array_remove_item(plist_t node, uint32_t n); + void plist_array_remove_item(plist_t node, uint32_t n); /******************************************** * * @@ -300,7 +293,7 @@ extern "C" * @param node the node of type #PLIST_DICT * @return size of the #PLIST_DICT node */ - PLIST_API uint32_t plist_dict_get_size(plist_t node); + uint32_t plist_dict_get_size(plist_t node); /** * Create an iterator of a #PLIST_DICT node. @@ -309,7 +302,7 @@ extern "C" * @param node the node of type #PLIST_DICT * @param iter iterator of the #PLIST_DICT node */ - PLIST_API void plist_dict_new_iter(plist_t node, plist_dict_iter *iter); + void plist_dict_new_iter(plist_t node, plist_dict_iter *iter); /** * Increment iterator of a #PLIST_DICT node. @@ -321,7 +314,7 @@ extern "C" * @param val a location to store the value, or NULL. The caller should *not* * free the returned value. */ - PLIST_API void plist_dict_next_item(plist_t node, plist_dict_iter iter, char **key, plist_t *val); + void plist_dict_next_item(plist_t node, plist_dict_iter iter, char **key, plist_t *val); /** * Get key associated to an item. Item must be member of a dictionary @@ -329,7 +322,7 @@ extern "C" * @param node the node * @param key a location to store the key. The caller is responsible for freeing the returned string. */ - PLIST_API void plist_dict_get_item_key(plist_t node, char **key); + void plist_dict_get_item_key(plist_t node, char **key); /** * Get the nth item in a #PLIST_DICT node. @@ -339,7 +332,7 @@ extern "C" * @return the item or NULL if node is not of type #PLIST_DICT. The caller should not free * the returned node. */ - PLIST_API plist_t plist_dict_get_item(plist_t node, const char* key); + plist_t plist_dict_get_item(plist_t node, const char* key); /** * Set item identified by key in a #PLIST_DICT node. @@ -350,7 +343,7 @@ extern "C" * @param item the new item associated to key * @param key the identifier of the item to set. */ - PLIST_API void plist_dict_set_item(plist_t node, const char* key, plist_t item); + void plist_dict_set_item(plist_t node, const char* key, plist_t item); /** * Insert a new item into a #PLIST_DICT node. @@ -362,7 +355,7 @@ extern "C" * @param key The identifier of the item to insert. */ PLIST_WARN_DEPRECATED("use plist_dict_set_item instead") - PLIST_API void plist_dict_insert_item(plist_t node, const char* key, plist_t item); + void plist_dict_insert_item(plist_t node, const char* key, plist_t item); /** * Remove an existing position in a #PLIST_DICT node. @@ -371,7 +364,7 @@ extern "C" * @param node the node of type #PLIST_DICT * @param key The identifier of the item to remove. Assert if identifier is not present. */ - PLIST_API void plist_dict_remove_item(plist_t node, const char* key); + void plist_dict_remove_item(plist_t node, const char* key); /** * Merge a dictionary into another. This will add all key/value pairs @@ -381,7 +374,7 @@ extern "C" * @param target pointer to an existing node of type #PLIST_DICT * @param source node of type #PLIST_DICT that should be merged into target */ - PLIST_API void plist_dict_merge(plist_t *target, plist_t source); + void plist_dict_merge(plist_t *target, plist_t source); /******************************************** @@ -395,7 +388,7 @@ extern "C" * * @param node the parent (NULL if node is root) */ - PLIST_API plist_t plist_get_parent(plist_t node); + plist_t plist_get_parent(plist_t node); /** * Get the #plist_type of a node. @@ -403,7 +396,7 @@ extern "C" * @param node the node * @return the type of the node */ - PLIST_API plist_type plist_get_node_type(plist_t node); + plist_type plist_get_node_type(plist_t node); /** * Get the value of a #PLIST_KEY node. @@ -413,7 +406,7 @@ extern "C" * @param val a pointer to a C-string. This function allocates the memory, * caller is responsible for freeing it. */ - PLIST_API void plist_get_key_val(plist_t node, char **val); + void plist_get_key_val(plist_t node, char **val); /** * Get the value of a #PLIST_STRING node. @@ -423,7 +416,7 @@ extern "C" * @param val a pointer to a C-string. This function allocates the memory, * caller is responsible for freeing it. Data is UTF-8 encoded. */ - PLIST_API void plist_get_string_val(plist_t node, char **val); + void plist_get_string_val(plist_t node, char **val); /** * Get the value of a #PLIST_BOOLEAN node. @@ -432,7 +425,7 @@ extern "C" * @param node the node * @param val a pointer to a uint8_t variable. */ - PLIST_API void plist_get_bool_val(plist_t node, uint8_t * val); + void plist_get_bool_val(plist_t node, uint8_t * val); /** * Get the value of a #PLIST_UINT node. @@ -441,7 +434,7 @@ extern "C" * @param node the node * @param val a pointer to a uint64_t variable. */ - PLIST_API void plist_get_uint_val(plist_t node, uint64_t * val); + void plist_get_uint_val(plist_t node, uint64_t * val); /** * Get the value of a #PLIST_REAL node. @@ -450,7 +443,7 @@ extern "C" * @param node the node * @param val a pointer to a double variable. */ - PLIST_API void plist_get_real_val(plist_t node, double *val); + void plist_get_real_val(plist_t node, double *val); /** * Get the value of a #PLIST_DATA node. @@ -461,7 +454,7 @@ extern "C" * caller is responsible for freeing it. * @param length the length of the buffer */ - PLIST_API void plist_get_data_val(plist_t node, char **val, uint64_t * length); + void plist_get_data_val(plist_t node, char **val, uint64_t * length); /** * Get the value of a #PLIST_DATE node. @@ -471,7 +464,7 @@ extern "C" * @param sec a pointer to an int32_t variable. Represents the number of seconds since 01/01/2001. * @param usec a pointer to an int32_t variable. Represents the number of microseconds */ - PLIST_API void plist_get_date_val(plist_t node, int32_t * sec, int32_t * usec); + void plist_get_date_val(plist_t node, int32_t * sec, int32_t * usec); /** * Get the value of a #PLIST_UID node. @@ -480,7 +473,7 @@ extern "C" * @param node the node * @param val a pointer to a uint64_t variable. */ - PLIST_API void plist_get_uid_val(plist_t node, uint64_t * val); + void plist_get_uid_val(plist_t node, uint64_t * val); /******************************************** @@ -496,7 +489,7 @@ extern "C" * @param node the node * @param val the key value */ - PLIST_API void plist_set_key_val(plist_t node, const char *val); + void plist_set_key_val(plist_t node, const char *val); /** * Set the value of a node. @@ -506,7 +499,7 @@ extern "C" * @param val the string value. The string is copied when set and will be * freed by the node. */ - PLIST_API void plist_set_string_val(plist_t node, const char *val); + void plist_set_string_val(plist_t node, const char *val); /** * Set the value of a node. @@ -515,7 +508,7 @@ extern "C" * @param node the node * @param val the boolean value */ - PLIST_API void plist_set_bool_val(plist_t node, uint8_t val); + void plist_set_bool_val(plist_t node, uint8_t val); /** * Set the value of a node. @@ -524,7 +517,7 @@ extern "C" * @param node the node * @param val the unsigned integer value */ - PLIST_API void plist_set_uint_val(plist_t node, uint64_t val); + void plist_set_uint_val(plist_t node, uint64_t val); /** * Set the value of a node. @@ -533,7 +526,7 @@ extern "C" * @param node the node * @param val the real value */ - PLIST_API void plist_set_real_val(plist_t node, double val); + void plist_set_real_val(plist_t node, double val); /** * Set the value of a node. @@ -544,7 +537,7 @@ extern "C" * be freed by the node. * @param length the length of the buffer */ - PLIST_API void plist_set_data_val(plist_t node, const char *val, uint64_t length); + void plist_set_data_val(plist_t node, const char *val, uint64_t length); /** * Set the value of a node. @@ -554,7 +547,7 @@ extern "C" * @param sec the number of seconds since 01/01/2001 * @param usec the number of microseconds */ - PLIST_API void plist_set_date_val(plist_t node, int32_t sec, int32_t usec); + void plist_set_date_val(plist_t node, int32_t sec, int32_t usec); /** * Set the value of a node. @@ -563,7 +556,7 @@ extern "C" * @param node the node * @param val the unsigned integer value */ - PLIST_API void plist_set_uid_val(plist_t node, uint64_t val); + void plist_set_uid_val(plist_t node, uint64_t val); /******************************************** @@ -580,7 +573,7 @@ extern "C" * caller is responsible for freeing it. Data is UTF-8 encoded. * @param length a pointer to an uint32_t variable. Represents the length of the allocated buffer. */ - PLIST_API void plist_to_xml(plist_t plist, char **plist_xml, uint32_t * length); + void plist_to_xml(plist_t plist, char **plist_xml, uint32_t * length); /** * Export the #plist_t structure to binary format. @@ -590,7 +583,7 @@ extern "C" * caller is responsible for freeing it. * @param length a pointer to an uint32_t variable. Represents the length of the allocated buffer. */ - PLIST_API void plist_to_bin(plist_t plist, char **plist_bin, uint32_t * length); + void plist_to_bin(plist_t plist, char **plist_bin, uint32_t * length); /** * Import the #plist_t structure from XML format. @@ -599,7 +592,7 @@ extern "C" * @param length length of the buffer to read. * @param plist a pointer to the imported plist. */ - PLIST_API void plist_from_xml(const char *plist_xml, uint32_t length, plist_t * plist); + void plist_from_xml(const char *plist_xml, uint32_t length, plist_t * plist); /** * Import the #plist_t structure from binary format. @@ -608,7 +601,7 @@ extern "C" * @param length length of the buffer to read. * @param plist a pointer to the imported plist. */ - PLIST_API void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist); + void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist); /******************************************** @@ -626,7 +619,7 @@ extern "C" * @param length length of the path to access * @return the value to access. */ - PLIST_API plist_t plist_access_path(plist_t plist, uint32_t length, ...); + plist_t plist_access_path(plist_t plist, uint32_t length, ...); /** * Variadic version of #plist_access_path. @@ -636,7 +629,7 @@ extern "C" * @param v list of array's index and dic'st key * @return the value to access. */ - PLIST_API plist_t plist_access_pathv(plist_t plist, uint32_t length, va_list v); + plist_t plist_access_pathv(plist_t plist, uint32_t length, va_list v); /** * Compare two node values @@ -645,7 +638,7 @@ extern "C" * @param node_r rigth node to compare * @return TRUE is type and value match, FALSE otherwise. */ - PLIST_API char plist_compare_node_value(plist_t node_l, plist_t node_r); + char plist_compare_node_value(plist_t node_l, plist_t node_r); /*@}*/ -- cgit v1.1-32-gdbae