From 07b8041d44c6b43da1b0c55d140999cb3137d040 Mon Sep 17 00:00:00 2001
From: Jonathan Beck
Date: Tue, 28 Apr 2009 22:15:39 +0200
Subject: Merge ascii and unicode handling in PLIST_STRING using UTF-8. Remove
 unicode related declaration in API (breaks API&ABI)

---
 include/plist/plist.h | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

(limited to 'include')

diff --git a/include/plist/plist.h b/include/plist/plist.h
index b7b0fa4..c289158 100644
--- a/include/plist/plist.h
+++ b/include/plist/plist.h
@@ -71,8 +71,6 @@ extern "C" {
 		PLIST_REAL,	/**< Real, scalar type */
 		PLIST_STRING,
 					/**< ASCII string, scalar type */
-		PLIST_UNICODE,
-					/**< Unicode strin, scalar type */
 		PLIST_ARRAY,/**< Ordered array, structured type */
 		PLIST_DICT,	/**< Unordered dictionary (key/value pair), structured type */
 		PLIST_DATE,	/**< Date, scalar type */
@@ -189,7 +187,7 @@ extern "C" {
  * (ie #PLIST_DICT or #PLIST_ARRAY).
  *
  * @param node the node to add a children to
- * @param val the string value encoded as an ASCII string (must be null terminated)
+ * @param val the string value encoded as an ASCII or UTF-8 string (must be null terminated)
  */
 	PLIST_API void plist_add_sub_string_el(plist_t node, const char *val);
 
@@ -230,15 +228,6 @@ extern "C" {
  */
 	PLIST_API void plist_add_sub_data_el(plist_t node, const char *val, uint64_t length);
 
-/**
- * Add a subnode of type #PLIST_UNICODE to a node. The node must be of a structured type
- * (ie #PLIST_DICT or #PLIST_ARRAY).
- *
- * @param node the node to add a children to
- * @param val the unicode string encoded in UTF-8 (must be null terminated)
- */
-	PLIST_API void plist_add_sub_unicode_el(plist_t node, const char *val);
-
 /**
  * Add a subnode of type #PLIST_DATE to a node. The node must be of a structured type
  * (ie #PLIST_DICT or #PLIST_ARRAY).
@@ -280,7 +269,7 @@ extern "C" {
  *
  * @param node the node
  * @param val a pointer to a C-string. This function allocates the memory,
- *            caller is responsible for freeing it.
+ *            caller is responsible for freeing it. Data is UTF-8 encoded.
  */
 	PLIST_API void plist_get_string_val(plist_t node, char **val);
 
@@ -321,16 +310,6 @@ extern "C" {
  */
 	PLIST_API void plist_get_data_val(plist_t node, char **val, uint64_t * length);
 
-/**
- * Get the value of a #PLIST_UNICODE node.
- * This function does nothing if node is not of type #PLIST_UNICODE
- *
- * @param node the node
- * @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_unicode_val(plist_t node, char **val);
-
 /**
  * Get the value of a #PLIST_DATE node.
  * This function does nothing if node is not of type #PLIST_DATE
-- 
cgit v1.1-32-gdbae