32 files changed, 3049 insertions, 2905 deletions
diff --git a/include/plist/Array.h b/include/plist/Array.h
index 8fd07cd..b81e6b1 100644
--- a/include/plist/Array.h
+++ b/include/plist/Array.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__ARRAY_H
@@ -30,23 +30,23 @@ namespace PList
 class Array : public Structure
 {
-    public :
+public :
-        Array(Node* parent = NULL);
+    Array(Node* parent = NULL);
-        Array(plist_t node, Node* parent = NULL);
+    Array(plist_t node, Node* parent = NULL);
-        Array(Array& a);
+    Array(Array& a);
-        Array& operator=(Array& a);
+    Array& operator=(Array& a);
-        virtual ~Array();
+    virtual ~Array();
-        Node* Clone();
+    Node* Clone();
-        Node* operator[](unsigned int index);
+    Node* operator[](unsigned int index);
-        void Append(Node* node);
+    void Append(Node* node);
-        void Insert(Node* node, unsigned int pos);
+    void Insert(Node* node, unsigned int pos);
-        void Remove(Node* node);
+    void Remove(Node* node);
-        void Remove(unsigned int pos);
+    void Remove(unsigned int pos);
-        
-    private :
+private :
-        std::vector<Node*> _array;
+    std::vector<Node*> _array;
 };
 };
diff --git a/include/plist/Boolean.h b/include/plist/Boolean.h
index 149f8da..731eb9e 100644
--- a/include/plist/Boolean.h
+++ b/include/plist/Boolean.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__BOOLEAN_H
@@ -29,18 +29,18 @@ namespace PList
 class Boolean : public Node
 {
-    public :
+public :
-        Boolean(Node* parent = NULL);
+    Boolean(Node* parent = NULL);
-        Boolean(plist_t node, Node* parent = NULL);
+    Boolean(plist_t node, Node* parent = NULL);
-        Boolean(Boolean& b);
+    Boolean(Boolean& b);
-        Boolean& operator=(Boolean& b);
+    Boolean& operator=(Boolean& b);
-        Boolean(bool b);
+    Boolean(bool b);
-        virtual ~Boolean();
+    virtual ~Boolean();
-        Node* Clone();
+    Node* Clone();
-        void SetValue(bool b);
+    void SetValue(bool b);
-        bool GetValue();
+    bool GetValue();
 };
 };
diff --git a/include/plist/Data.h b/include/plist/Data.h
index 59a0096..f8ae715 100644
--- a/include/plist/Data.h
+++ b/include/plist/Data.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__DATA_H
@@ -30,18 +30,18 @@ namespace PList
 class Data : public Node
 {
-    public :
+public :
-        Data(Node* parent = NULL);
+    Data(Node* parent = NULL);
-        Data(plist_t node, Node* parent = NULL);
+    Data(plist_t node, Node* parent = NULL);
-        Data(Data& d);
+    Data(Data& d);
-        Data& operator=(Data& d);
+    Data& operator=(Data& d);
-        Data(const std::vector<char>& buff);
+    Data(const std::vector<char>& buff);
-        virtual ~Data();
+    virtual ~Data();
-        Node* Clone();
+    Node* Clone();
-        void SetValue(const std::vector<char>& buff);
+    void SetValue(const std::vector<char>& buff);
-        std::vector<char> GetValue();
+    std::vector<char> GetValue();
 };
 };
diff --git a/include/plist/Date.h b/include/plist/Date.h
index 9c092ea..dc12233 100644
--- a/include/plist/Date.h
+++ b/include/plist/Date.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__DATE_H
@@ -34,18 +34,18 @@ namespace PList
 class Date : public Node
 {
-    public :
+public :
-        Date(Node* parent = NULL);
+    Date(Node* parent = NULL);
-        Date(plist_t node, Node* parent = NULL);
+    Date(plist_t node, Node* parent = NULL);
-        Date(Date& d);
+    Date(Date& d);
-        Date& operator=(Date& d);
+    Date& operator=(Date& d);
-        Date(timeval t);
+    Date(timeval t);
-        virtual ~Date();
+    virtual ~Date();
-        Node* Clone();
+    Node* Clone();
-        void SetValue(timeval t);
+    void SetValue(timeval t);
-        timeval GetValue();
+    timeval GetValue();
 };
 };
diff --git a/include/plist/Dictionary.h b/include/plist/Dictionary.h
index 38604c8..e43d29e 100644
--- a/include/plist/Dictionary.h
+++ b/include/plist/Dictionary.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__DICTIONARY_H
@@ -31,27 +31,27 @@ namespace PList
 class Dictionary : public Structure
 {
-    public :
+public :
-        Dictionary(Node* parent = NULL);
+    Dictionary(Node* parent = NULL);
-        Dictionary(plist_t node, Node* parent = NULL);
+    Dictionary(plist_t node, Node* parent = NULL);
-        Dictionary(Dictionary& d);
+    Dictionary(Dictionary& d);
-        Dictionary& operator=(Dictionary& d);
+    Dictionary& operator=(Dictionary& d);
-        virtual ~Dictionary();
+    virtual ~Dictionary();
-        Node* Clone();
+    Node* Clone();
-        typedef std::map<std::string,Node*>::iterator iterator;
+    typedef std::map<std::string,Node*>::iterator iterator;
-        
-        Node* operator[](const std::string& key);
+    Node* operator[](const std::string& key);
-        iterator Begin();
+    iterator Begin();
-        iterator End();
+    iterator End();
-        iterator Find(const std::string& key);
+    iterator Find(const std::string& key);
-        iterator Insert(const std::string& key, Node* node);
+    iterator Insert(const std::string& key, Node* node);
-        void Remove(Node* node);
+    void Remove(Node* node);
-        void Remove(const std::string& key);
+    void Remove(const std::string& key);
-        
-    private :
+private :
-        std::map<std::string,Node*> _map;
+    std::map<std::string,Node*> _map;
 };
diff --git a/include/plist/Integer.h b/include/plist/Integer.h
index fefcea1..7cdf0df 100644
--- a/include/plist/Integer.h
+++ b/include/plist/Integer.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__INTEGER_H
@@ -29,18 +29,18 @@ namespace PList
 class Integer : public Node
 {
-    public :
+public :
-        Integer(Node* parent = NULL);
+    Integer(Node* parent = NULL);
-        Integer(plist_t node, Node* parent = NULL);
+    Integer(plist_t node, Node* parent = NULL);
-        Integer(Integer& i);
+    Integer(Integer& i);
-        Integer& operator=(Integer& i);
+    Integer& operator=(Integer& i);
-        Integer(uint64_t i);
+    Integer(uint64_t i);
-        virtual ~Integer();
+    virtual ~Integer();
-        Node* Clone();
+    Node* Clone();
-        void SetValue(uint64_t i);
+    void SetValue(uint64_t i);
-        uint64_t GetValue();
+    uint64_t GetValue();
 };
 };
diff --git a/include/plist/Node.h b/include/plist/Node.h
index 6e5411a..7ea6ed9 100644
--- a/include/plist/Node.h
+++ b/include/plist/Node.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__NODE_H
@@ -29,22 +29,22 @@ namespace PList
 class Node
 {
-    public :
+public :
-        virtual ~Node();
+    virtual ~Node();
-        virtual Node* Clone() = 0;
+    virtual Node* Clone() = 0;
-        Node * GetParent();
+    Node * GetParent();
-        void SetParent(Node* parent);
+    void SetParent(Node* parent);
-        plist_type GetType();
+    plist_type GetType();
-        plist_t GetPlist();
+    plist_t GetPlist();
-        
-    protected:
+protected:
-        Node(Node* parent = NULL);
+    Node(Node* parent = NULL);
-        Node(plist_t node, Node* parent = NULL);
+    Node(plist_t node, Node* parent = NULL);
-        Node(plist_type type, Node* parent = NULL);
+    Node(plist_type type, Node* parent = NULL);
-        plist_t _node;
+    plist_t _node;
-        Node* _parent;
+    Node* _parent;
 };
 };
diff --git a/include/plist/Real.h b/include/plist/Real.h
index 755842e..7d6f8e2 100644
--- a/include/plist/Real.h
+++ b/include/plist/Real.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__REAL_H
@@ -29,18 +29,18 @@ namespace PList
 class Real : public Node
 {
-    public :
+public :
-        Real(Node* parent = NULL);
+    Real(Node* parent = NULL);
-        Real(plist_t node, Node* parent = NULL);
+    Real(plist_t node, Node* parent = NULL);
-        Real(Real& d);
+    Real(Real& d);
-        Real& operator=(Real& d);
+    Real& operator=(Real& d);
-        Real(double d);
+    Real(double d);
-        virtual ~Real();
+    virtual ~Real();
-        Node* Clone();
+    Node* Clone();
-        void SetValue(double d);
+    void SetValue(double d);
-        double GetValue();
+    double GetValue();
 };
 };
diff --git a/include/plist/String.h b/include/plist/String.h
index 58b8619..bd8680d 100644
--- a/include/plist/String.h
+++ b/include/plist/String.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__STRING_H
@@ -30,18 +30,18 @@ namespace PList
 class String : public Node
 {
-    public :
+public :
-        String(Node* parent = NULL);
+    String(Node* parent = NULL);
-        String(plist_t node, Node* parent = NULL);
+    String(plist_t node, Node* parent = NULL);
-        String(String& s);
+    String(String& s);
-        String& operator=(String& s);
+    String& operator=(String& s);
-        String(const std::string& s);
+    String(const std::string& s);
-        virtual ~String();
+    virtual ~String();
-        Node* Clone();
+    Node* Clone();
-        void SetValue(const std::string& s);
+    void SetValue(const std::string& s);
-        std::string GetValue();
+    std::string GetValue();
 };
 };
diff --git a/include/plist/Structure.h b/include/plist/Structure.h
index 239a8b8..66d9293 100644
--- a/include/plist/Structure.h
+++ b/include/plist/Structure.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__STRUCTURE_H
@@ -31,23 +31,23 @@ namespace PList
 class Structure : public Node
 {
-    public :
+public :
-        virtual ~Structure();
+    virtual ~Structure();
+    uint32_t GetSize();
-        uint32_t GetSize();
+    std::string ToXml();
+    std::vector<char> ToBin();
-        std::string ToXml();
+    virtual void Remove(Node* node) = 0;
-        std::vector<char> ToBin();
-        virtual void Remove(Node* node) = 0;
+protected:
-        
+    Structure(Node* parent = NULL);
-    protected:
+    Structure(plist_type type, Node* parent = NULL);
-        Structure(Node* parent = NULL);
-        Structure(plist_type type, Node* parent = NULL);
-    private:
+private:
-        Structure(Structure& s);
+    Structure(Structure& s);
-        Structure& operator=(const Structure& s);
+    Structure& operator=(const Structure& s);
 };
 };
diff --git a/include/plist/Utils.h b/include/plist/Utils.h
index 4cf6003..52503a0 100644
--- a/include/plist/Utils.h
+++ b/include/plist/Utils.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST__UTILS_H
@@ -27,17 +27,17 @@
 namespace PList
 {
-    class Utils
+class Utils
-    {
+{
-        public:
+public:
-            static Node* FromPlist(plist_t node, Node* parent = NULL);
+    static Node* FromPlist(plist_t node, Node* parent = NULL);
-            static Structure* FromXml(const std::string& xml);
+    static Structure* FromXml(const std::string& xml);
-            static Structure* FromBin(const std::vector<char>& bin);
+    static Structure* FromBin(const std::vector<char>& bin);
-        private:
+private:
-            Utils();
+    Utils();
-            ~Utils();
+    ~Utils();
-    };
+};
 };
 #endif // PLIST__UTILS_H
diff --git a/include/plist/plist++.h b/include/plist/plist++.h
index 7d59e68..79181c5 100644
--- a/include/plist/plist++.h
+++ b/include/plist/plist++.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef LIBPLISTXX_H
diff --git a/include/plist/plist.h b/include/plist/plist.h
index 699a0d6..d3f0836 100644
--- a/include/plist/plist.h
+++ b/include/plist/plist.h
@@ -8,22 +8,23 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef LIBPLIST_H
 #define LIBPLIST_H
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 #ifdef _MSC_VER
@@ -37,705 +38,706 @@ extern "C" {
    typedef unsigned __int32 uint32_t;
    typedef unsigned __int64 uint64_t;
-    #ifdef plist_EXPORTS
+#ifdef plist_EXPORTS
-        #define PLIST_API  __declspec( dllexport )
+#define PLIST_API  __declspec( dllexport )
-    #else
+#else
-        #define PLIST_API  __declspec( dllimport )
+#define PLIST_API  __declspec( dllimport )
-    #endif
+#endif
 #else
-    #include <stdint.h>
+#include <stdint.h>
-    #define PLIST_API
+#define PLIST_API
 #endif
 #include <sys/types.h>
 #include <stdarg.h>
-/**
+    /**
- * \mainpage libplist : A library to handle Apple Property Lists
+     * \mainpage libplist : A library to handle Apple Property Lists
- * \defgroup PublicAPI Public libplist API
+     * \defgroup PublicAPI Public libplist API
- */
+     */
-/*@{*/
+    /*@{*/
-/**
+    /**
- * The basic plist abstract data type.
+     * The basic plist abstract data type.
- */
+     */
-        typedef void *plist_t;
+    typedef void *plist_t;
-/**
+    /**
- * The plist dictionary iterator.
+     * The plist dictionary iterator.
- */
+     */
-        typedef void *plist_dict_iter;
+    typedef void *plist_dict_iter;
-/**
+    /**
- * The enumeration of plist node types.
+     * The enumeration of plist node types.
- */
+     */
-        typedef enum {
+    typedef enum
-                PLIST_BOOLEAN,  /**< Boolean, scalar type */
+    {
-                PLIST_UINT,     /**< Unsigned integer, scalar type */
+        PLIST_BOOLEAN,  /**< Boolean, scalar type */
-                PLIST_REAL,     /**< Real, scalar type */
+        PLIST_UINT,     /**< Unsigned integer, scalar type */
-                PLIST_STRING,   /**< ASCII string, scalar type */
+        PLIST_REAL,     /**< Real, scalar type */
-                PLIST_ARRAY,    /**< Ordered array, structured type */
+        PLIST_STRING,   /**< ASCII string, scalar type */
-                PLIST_DICT,     /**< Unordered dictionary (key/value pair), structured type */
+        PLIST_ARRAY,    /**< Ordered array, structured type */
-                PLIST_DATE,     /**< Date, scalar type */
+        PLIST_DICT,     /**< Unordered dictionary (key/value pair), structured type */
-                PLIST_DATA,     /**< Binary data, scalar type */
+        PLIST_DATE,     /**< Date, scalar type */
-                PLIST_KEY,      /**< Key in dictionaries (ASCII String), scalar type */
+        PLIST_DATA,     /**< Binary data, scalar type */
-                PLIST_NONE      /**< No type */
+        PLIST_KEY,      /**< Key in dictionaries (ASCII String), scalar type */
-        } plist_type;
+        PLIST_NONE      /**< No type */
+    } plist_type;
-/********************************************
- *                                          *
+    /********************************************
- *          Creation & Destruction          *
+     *                                          *
- *                                          *
+     *          Creation & Destruction          *
- ********************************************/
+     *                                          *
+     ********************************************/
-/**
- * Create a new root plist_t type #PLIST_DICT
+    /**
- *
+     * Create a new root plist_t type #PLIST_DICT
- * @return the created plist
+     *
- * @sa #plist_type
+     * @return the created plist
- */
+     * @sa #plist_type
-        PLIST_API plist_t plist_new_dict(void);
+     */
+    PLIST_API plist_t plist_new_dict(void);
-/**
- * Create a new root plist_t type #PLIST_ARRAY
+    /**
- *
+     * Create a new root plist_t type #PLIST_ARRAY
- * @return the created plist
+     *
- * @sa #plist_type
+     * @return the created plist
- */
+     * @sa #plist_type
-        PLIST_API plist_t plist_new_array(void);
+     */
+    PLIST_API plist_t plist_new_array(void);
-/**
- * Create a new plist_t type #PLIST_STRING
+    /**
- *
+     * Create a new plist_t type #PLIST_STRING
- * @param val the sting value, encoded in UTF8.
+     *
- * @return the created item
+     * @param val the sting value, encoded in UTF8.
- * @sa #plist_type
+     * @return the created item
- */
+     * @sa #plist_type
-        PLIST_API plist_t plist_new_string(const char *val);
+     */
+    PLIST_API plist_t plist_new_string(const char *val);
-/**
- * Create a new plist_t type #PLIST_BOOLEAN
+    /**
- *
+     * Create a new plist_t type #PLIST_BOOLEAN
- * @param val the boolean value, 0 is false, other values are true.
+     *
- * @return the created item
+     * @param val the boolean value, 0 is false, other values are true.
- * @sa #plist_type
+     * @return the created item
- */
+     * @sa #plist_type
-        PLIST_API plist_t plist_new_bool(uint8_t val);
+     */
+    PLIST_API plist_t plist_new_bool(uint8_t val);
-/**
- * Create a new plist_t type #PLIST_UINT
+    /**
- *
+     * Create a new plist_t type #PLIST_UINT
- * @param val the unsigned integer value
+     *
- * @return the created item
+     * @param val the unsigned integer value
- * @sa #plist_type
+     * @return the created item
- */
+     * @sa #plist_type
-        PLIST_API plist_t plist_new_uint(uint64_t val);
+     */
+    PLIST_API plist_t plist_new_uint(uint64_t val);
-/**
- * Create a new plist_t type #PLIST_REAL
+    /**
- *
+     * Create a new plist_t type #PLIST_REAL
- * @param val the real value
+     *
- * @return the created item
+     * @param val the real value
- * @sa #plist_type
+     * @return the created item
- */
+     * @sa #plist_type
-        PLIST_API plist_t plist_new_real(double val);
+     */
+    PLIST_API plist_t plist_new_real(double val);
-/**
- * Create a new plist_t type #PLIST_DATA
+    /**
- *
+     * Create a new plist_t type #PLIST_DATA
- * @param val the binary buffer
+     *
- * @param length the length of the buffer
+     * @param val the binary buffer
- * @return the created item
+     * @param length the length of the buffer
- * @sa #plist_type
+     * @return the created item
- */
+     * @sa #plist_type
-        PLIST_API plist_t plist_new_data(const char *val, uint64_t length);
+     */
+    PLIST_API plist_t plist_new_data(const char *val, uint64_t length);
-/**
- * Create a new plist_t type #PLIST_DATE
+    /**
- *
+     * Create a new plist_t type #PLIST_DATE
- * @param sec the number of seconds since 01/01/2001
+     *
- * @param usec the number of microseconds
+     * @param sec the number of seconds since 01/01/2001
- * @return the created item
+     * @param usec the number of microseconds
- * @sa #plist_type
+     * @return the created item
- */
+     * @sa #plist_type
-        PLIST_API plist_t plist_new_date(int32_t sec, int32_t usec);
+     */
+    PLIST_API plist_t plist_new_date(int32_t sec, int32_t usec);
-/**
- * Destruct a plist_t node and all its children recursively
+    /**
- *
+     * Destruct a plist_t node and all its children recursively
- * @param plist the plist to free
+     *
- */
+     * @param plist the plist to free
-        PLIST_API void plist_free(plist_t plist);
+     */
+    PLIST_API void plist_free(plist_t plist);
-/**
- * Return a copy of passed node and it's children
+    /**
- *
+     * Return a copy of passed node and it's children
- * @param plist the plist to copy
+     *
- * @return copied plist
+     * @param plist the plist to copy
- */
+     * @return copied plist
-        PLIST_API plist_t plist_copy(plist_t node);
+     */
+    PLIST_API plist_t plist_copy(plist_t node);
-/********************************************
- *                                          *
+    /********************************************
- *            Array functions               *
+     *                                          *
- *                                          *
+     *            Array functions               *
- ********************************************/
+     *                                          *
+     ********************************************/
-/**
- * Get size of a #PLIST_ARRAY node.
+    /**
- *
+     * Get size of a #PLIST_ARRAY node.
- * @param node the node of type #PLIST_ARRAY
+     *
- * @return size of the #PLIST_ARRAY node
+     * @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);
+     */
+    PLIST_API uint32_t plist_array_get_size(plist_t node);
-/**
- * Get the nth item in a #PLIST_ARRAY node.
+    /**
- *
+     * Get the nth item in a #PLIST_ARRAY node.
- * @param node the node of type #PLIST_ARRAY
+     *
- * @param n the index of the item to get. Range is [0, array_size[
+     * @param node the node of type #PLIST_ARRAY
- * @return the nth item or NULL if node is not of type #PLIST_ARRAY
+     * @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_API 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.
+    /**
- *
+     * Get the index of an item. item must be a member of a #PLIST_ARRAY node.
- * @param node the node
+     *
- * @return the node index
+     * @param node the node
- */
+     * @return the node index
-        PLIST_API uint32_t plist_array_get_item_index(plist_t node);
+     */
+    PLIST_API uint32_t plist_array_get_item_index(plist_t node);
-/**
- * Set the nth item in a #PLIST_ARRAY node.
+    /**
- * The previous item at index n will be freed using #plist_free
+     * Set the nth item in a #PLIST_ARRAY node.
- *
+     * The previous item at index n will be freed using #plist_free
- * @param node the node of type #PLIST_ARRAY
+     *
- * @param item the new item at index n
+     * @param node the node of type #PLIST_ARRAY
- * @param n the index of the item to get. Range is [0, array_size[. Assert if n is not in range.
+     * @param item the new item at index n
- */
+     * @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);
+     */
+    PLIST_API 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.
+    /**
- *
+     * Append a new item at the end of a #PLIST_ARRAY node.
- * @param node the node of type #PLIST_ARRAY
+     *
- * @param item the new item
+     * @param node the node of type #PLIST_ARRAY
- */
+     * @param item the new item
-        PLIST_API void plist_array_append_item(plist_t node, plist_t item);
+     */
+    PLIST_API void plist_array_append_item(plist_t node, plist_t item);
-/**
- * Insert a new item at position n in a #PLIST_ARRAY node.
+    /**
- *
+     * Insert a new item at position n in a #PLIST_ARRAY node.
- * @param node the node of type #PLIST_ARRAY
+     *
- * @param item the new item to insert
+     * @param node the node of type #PLIST_ARRAY
- * @param n The position at which the node will be stored. Range is [0, array_size[. Assert if n is not in range.
+     * @param item the new item to insert
- */
+     * @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);
+     */
+    PLIST_API void plist_array_insert_item(plist_t node, plist_t item, uint32_t n);
-/**
- * Remove an existing position in a #PLIST_ARRAY node.
+    /**
- * Removed position will be freed using #plist_free
+     * Remove an existing position in a #PLIST_ARRAY node.
- *
+     * Removed position will be freed using #plist_free
- * @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.
+     * @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);
+     */
+    PLIST_API void plist_array_remove_item(plist_t node, uint32_t n);
-/********************************************
- *                                          *
+    /********************************************
- *         Dictionary functions             *
+     *                                          *
- *                                          *
+     *         Dictionary functions             *
- ********************************************/
+     *                                          *
+     ********************************************/
-/**
- * Get size of a #PLIST_DICT node.
+    /**
- *
+     * Get size of a #PLIST_DICT node.
- * @param node the node of type #PLIST_DICT
+     *
- * @return size of the #PLIST_DICT node
+     * @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);
+     */
+    PLIST_API uint32_t plist_dict_get_size(plist_t node);
-/**
- * Create iterator of a #PLIST_DICT node.
+    /**
- * The allocated iterator shoult be freed with tandard free function
+     * Create iterator of a #PLIST_DICT node.
- *
+     * The allocated iterator shoult be freed with tandard free function
- * @param node the node of type #PLIST_DICT
+     *
- * @param iter iterator of the #PLIST_DICT node
+     * @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);
+     */
+    PLIST_API void plist_dict_new_iter(plist_t node, plist_dict_iter *iter);
-/**
- * Increment iterator of a #PLIST_DICT node.
+    /**
- *
+     * Increment iterator of a #PLIST_DICT node.
- * @param node the node of type #PLIST_DICT
+     *
- * @param iter iterator of the dictionary
+     * @param node the node of type #PLIST_DICT
- * @param key a location to store the key, or NULL.
+     * @param iter iterator of the dictionary
- * @param val a location to store the value, or NULL.
+     * @param key a location to store the key, or NULL.
- */
+     * @param val a location to store the value, or NULL.
-        PLIST_API void plist_dict_next_item(plist_t node, plist_dict_iter iter, char **key, plist_t *val);
+     */
+    PLIST_API 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
+    /**
- *
+     * Get key associated to an item. Item must be member of a dictionary
- * @param node the node
+     *
- * @param key a location to store the key.
+     * @param node the node
- */
+     * @param key a location to store the key.
-        PLIST_API void plist_dict_get_item_key(plist_t node, char **key);
+     */
+    PLIST_API void plist_dict_get_item_key(plist_t node, char **key);
-/**
- * Get the nth item in a #PLIST_DICT node.
+    /**
- *
+     * Get the nth item in a #PLIST_DICT node.
- * @param node the node of type #PLIST_DICT
+     *
- * @param key the identifier of the item to get.
+     * @param node the node of type #PLIST_DICT
- * @return the item or NULL if node is not of type #PLIST_DICT
+     * @param key the identifier of the item to get.
- */
+     * @return the item or NULL if node is not of type #PLIST_DICT
-        PLIST_API plist_t plist_dict_get_item(plist_t node, const char* key);
+     */
+    PLIST_API plist_t plist_dict_get_item(plist_t node, const char* key);
-/**
- * Set item identified by key in a #PLIST_DICT node.
+    /**
- * The previous item at index n will be freed using #plist_free
+     * Set item identified by key in a #PLIST_DICT node.
- *
+     * The previous item at index n will be freed using #plist_free
- * @param node the node of type #PLIST_DICT
+     *
- * @param item the new item associated to key
+     * @param node the node of type #PLIST_DICT
- * @param key the identifier of the item to get. Assert if identifier is not present.
+     * @param item the new item associated to key
- */
+     * @param key the identifier of the item to get. Assert if identifier is not present.
-        PLIST_API void plist_dict_set_item(plist_t node, const char* key, plist_t item);
+     */
+    PLIST_API void plist_dict_set_item(plist_t node, const char* key, plist_t item);
-/**
- * Insert a new item at position n in a #PLIST_DICT node.
+    /**
- *
+     * Insert a new item at position n in a #PLIST_DICT node.
- * @param node the node of type #PLIST_DICT
+     *
- * @param item the new item to insert
+     * @param node the node of type #PLIST_DICT
- * @param key The identifier of the item to insert. Assert if identifier already present.
+     * @param item the new item to insert
- */
+     * @param key The identifier of the item to insert. Assert if identifier already present.
-        PLIST_API void plist_dict_insert_item(plist_t node, const char* key, plist_t item);
+     */
+    PLIST_API void plist_dict_insert_item(plist_t node, const char* key, plist_t item);
-/**
- * Remove an existing position in a #PLIST_DICT node.
+    /**
- * Removed position will be freed using #plist_free
+     * Remove an existing position in a #PLIST_DICT node.
- *
+     * Removed position will be freed using #plist_free
- * @param node the node of type #PLIST_DICT
+     *
- * @param key The identifier of the item to remove. Assert if identifier is not present.
+     * @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);
+     */
+    PLIST_API void plist_dict_remove_item(plist_t node, const char* key);
-/********************************************
- *                                          *
+    /********************************************
- *                Getters                   *
+     *                                          *
- *                                          *
+     *                Getters                   *
- ********************************************/
+     *                                          *
+     ********************************************/
-/**
- * Get the parent of a node
+    /**
- *
+     * Get the parent of a node
- * @param node the parent (NULL if node is root)
+     *
- */
+     * @param node the parent (NULL if node is root)
-        PLIST_API plist_t plist_get_parent(plist_t node);
+     */
+    PLIST_API plist_t plist_get_parent(plist_t node);
-/**
- * Get the #plist_type of a node.
+    /**
- *
+     * Get the #plist_type of a node.
- * @param node the node
+     *
- * @return the type of the node
+     * @param node the node
- */
+     * @return the type of the node
-        PLIST_API plist_type plist_get_node_type(plist_t node);
+     */
+    PLIST_API plist_type plist_get_node_type(plist_t node);
-/**
- * Get the value of a #PLIST_KEY node.
+    /**
- * This function does nothing if node is not of type #PLIST_KEY
+     * Get the value of a #PLIST_KEY node.
- *
+     * This function does nothing if node is not of type #PLIST_KEY
- * @param node the node
+     *
- * @param val a pointer to a C-string. This function allocates the memory,
+     * @param node the node
- *            caller is responsible for freeing it.
+     * @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);
+     */
+    PLIST_API void plist_get_key_val(plist_t node, char **val);
-/**
- * Get the value of a #PLIST_STRING node.
+    /**
- * This function does nothing if node is not of type #PLIST_STRING
+     * Get the value of a #PLIST_STRING node.
- *
+     * This function does nothing if node is not of type #PLIST_STRING
- * @param node the node
+     *
- * @param val a pointer to a C-string. This function allocates the memory,
+     * @param node the node
- *            caller is responsible for freeing it. Data is UTF-8 encoded.
+     * @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);
+     */
+    PLIST_API void plist_get_string_val(plist_t node, char **val);
-/**
- * Get the value of a #PLIST_BOOLEAN node.
+    /**
- * This function does nothing if node is not of type #PLIST_BOOLEAN
+     * Get the value of a #PLIST_BOOLEAN node.
- *
+     * This function does nothing if node is not of type #PLIST_BOOLEAN
- * @param node the node
+     *
- * @param val a pointer to a uint8_t variable.
+     * @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);
+     */
+    PLIST_API void plist_get_bool_val(plist_t node, uint8_t * val);
-/**
- * Get the value of a #PLIST_UINT node.
+    /**
- * This function does nothing if node is not of type #PLIST_UINT
+     * Get the value of a #PLIST_UINT node.
- *
+     * This function does nothing if node is not of type #PLIST_UINT
- * @param node the node
+     *
- * @param val a pointer to a uint64_t variable.
+     * @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);
+     */
+    PLIST_API void plist_get_uint_val(plist_t node, uint64_t * val);
-/**
- * Get the value of a #PLIST_REAL node.
+    /**
- * This function does nothing if node is not of type #PLIST_REAL
+     * Get the value of a #PLIST_REAL node.
- *
+     * This function does nothing if node is not of type #PLIST_REAL
- * @param node the node
+     *
- * @param val a pointer to a double variable.
+     * @param node the node
- */
+     * @param val a pointer to a double variable.
-        PLIST_API void plist_get_real_val(plist_t node, double *val);
+     */
+    PLIST_API void plist_get_real_val(plist_t node, double *val);
-/**
- * Get the value of a #PLIST_DATA node.
+    /**
- * This function does nothing if node is not of type #PLIST_DATA
+     * Get the value of a #PLIST_DATA node.
- *
+     * This function does nothing if node is not of type #PLIST_DATA
- * @param node the node
+     *
- * @param val a pointer to an unallocated char buffer. This function allocates the memory,
+     * @param node the node
- *            caller is responsible for freeing it.
+     * @param val a pointer to an unallocated char buffer. This function allocates the memory,
- */
+     *            caller is responsible for freeing it.
-        PLIST_API void plist_get_data_val(plist_t node, char **val, uint64_t * length);
+     */
+    PLIST_API void plist_get_data_val(plist_t node, char **val, uint64_t * length);
-/**
- * Get the value of a #PLIST_DATE node.
+    /**
- * This function does nothing if node is not of type #PLIST_DATE
+     * Get the value of a #PLIST_DATE node.
- *
+     * This function does nothing if node is not of type #PLIST_DATE
- * @param node the node
+     *
- * @param sec a pointer to an int32_t variable. Represents the number of seconds since 01/01/2001.
+     * @param node the node
- * @param usec a pointer to an int32_t variable. Represents the number of microseconds
+     * @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);
+     */
+    PLIST_API void plist_get_date_val(plist_t node, int32_t * sec, int32_t * usec);
-/********************************************
- *                                          *
+    /********************************************
- *                Setters                   *
+     *                                          *
- *                                          *
+     *                Setters                   *
- ********************************************/
+     *                                          *
+     ********************************************/
-/**
- * Forces type of node. Changing type of structured nodes is only allowed if node is empty.
+    /**
- * Reset value of node;
+     * Forces type of node. Changing type of structured nodes is only allowed if node is empty.
- * @param node the node
+     * Reset value of node;
- * @param type the key value
+     * @param node the node
- */
+     * @param type the key value
-        PLIST_API void plist_set_type(plist_t node, plist_type type);
+     */
+    PLIST_API void plist_set_type(plist_t node, plist_type type);
-/**
- * Set the value of a node.
+    /**
- * Forces type of node to #PLIST_KEY
+     * Set the value of a node.
- *
+     * Forces type of node to #PLIST_KEY
- * @param node the node
+     *
- * @param val the key value
+     * @param node the node
- */
+     * @param val the key value
-        PLIST_API void plist_set_key_val(plist_t node, const char *val);
+     */
+    PLIST_API void plist_set_key_val(plist_t node, const char *val);
-/**
- * Set the value of a node.
+    /**
- * Forces type of node to #PLIST_STRING
+     * Set the value of a node.
- *
+     * Forces type of node to #PLIST_STRING
- * @param node the node
+     *
- * @param val the string value
+     * @param node the node
- */
+     * @param val the string value
-        PLIST_API void plist_set_string_val(plist_t node, const char *val);
+     */
+    PLIST_API void plist_set_string_val(plist_t node, const char *val);
-/**
- * Set the value of a node.
+    /**
- * Forces type of node to #PLIST_BOOLEAN
+     * Set the value of a node.
- *
+     * Forces type of node to #PLIST_BOOLEAN
- * @param node the node
+     *
- * @param val the boolean value
+     * @param node the node
- */
+     * @param val the boolean value
-        PLIST_API void plist_set_bool_val(plist_t node, uint8_t val);
+     */
+    PLIST_API void plist_set_bool_val(plist_t node, uint8_t val);
-/**
- * Set the value of a node.
+    /**
- * Forces type of node to #PLIST_UINT
+     * Set the value of a node.
- *
+     * Forces type of node to #PLIST_UINT
- * @param node the node
+     *
- * @param val the unsigned integer value
+     * @param node the node
- */
+     * @param val the unsigned integer value
-        PLIST_API void plist_set_uint_val(plist_t node, uint64_t val);
+     */
+    PLIST_API void plist_set_uint_val(plist_t node, uint64_t val);
-/**
- * Set the value of a node.
+    /**
- * Forces type of node to #PLIST_REAL
+     * Set the value of a node.
- *
+     * Forces type of node to #PLIST_REAL
- * @param node the node
+     *
- * @param val the real value
+     * @param node the node
- */
+     * @param val the real value
-        PLIST_API void plist_set_real_val(plist_t node, double val);
+     */
+    PLIST_API void plist_set_real_val(plist_t node, double val);
-/**
- * Set the value of a node.
+    /**
- * Forces type of node to #PLIST_DATA
+     * Set the value of a node.
- *
+     * Forces type of node to #PLIST_DATA
- * @param node the node
+     *
- * @param val the binary buffer
+     * @param node the node
- * @param length the length of the buffer
+     * @param val the binary buffer
- */
+     * @param length the length of the buffer
-        PLIST_API void plist_set_data_val(plist_t node, const char *val, uint64_t length);
+     */
+    PLIST_API void plist_set_data_val(plist_t node, const char *val, uint64_t length);
-/**
- * Set the value of a node.
+    /**
- * Forces type of node to #PLIST_DATE
+     * Set the value of a node.
- *
+     * Forces type of node to #PLIST_DATE
- * @param node the node
+     *
- * @param sec the number of seconds since 01/01/2001
+     * @param node the node
- * @param usec the number of microseconds
+     * @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);
+     */
+    PLIST_API void plist_set_date_val(plist_t node, int32_t sec, int32_t usec);
-/********************************************
- *                                          *
+    /********************************************
- *            Import & Export               *
+     *                                          *
- *                                          *
+     *            Import & Export               *
- ********************************************/
+     *                                          *
+     ********************************************/
-/**
- * Export the #plist_t structure to XML format.
+    /**
- *
+     * Export the #plist_t structure to XML format.
- * @param plist the root node to export
+     *
- * @param plist_xml a pointer to a C-string. This function allocates the memory,
+     * @param plist the root node to export
- *            caller is responsible for freeing it. Data is UTF-8 encoded.
+     * @param plist_xml a pointer to a C-string. This function allocates the memory,
- * @param length a pointer to an uint32_t variable. Represents the length of the allocated buffer.
+     *            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);
+     */
+    PLIST_API void plist_to_xml(plist_t plist, char **plist_xml, uint32_t * length);
-/**
- * Export the #plist_t structure to binary format.
+    /**
- *
+     * Export the #plist_t structure to binary format.
- * @param plist the root node to export
+     *
- * @param plist_bin a pointer to a char* buffer. This function allocates the memory,
+     * @param plist the root node to export
- *            caller is responsible for freeing it.
+     * @param plist_bin a pointer to a char* buffer. This function allocates the memory,
- * @param length a pointer to an uint32_t variable. Represents the length of the allocated buffer.
+     *            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);
+     */
+    PLIST_API void plist_to_bin(plist_t plist, char **plist_bin, uint32_t * length);
-/**
- * Import the #plist_t structure from XML format.
+    /**
- *
+     * Import the #plist_t structure from XML format.
- * @param plist_xml a pointer to the xml buffer.
+     *
- * @param length length of the buffer to read.
+     * @param plist_xml a pointer to the xml buffer.
- * @param plist a pointer to the imported plist.
+     * @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);
+     */
+    PLIST_API void plist_from_xml(const char *plist_xml, uint32_t length, plist_t * plist);
-/**
- * Import the #plist_t structure from binary format.
+    /**
- *
+     * Import the #plist_t structure from binary format.
- * @param plist_bin a pointer to the xml buffer.
+     *
- * @param length length of the buffer to read.
+     * @param plist_bin a pointer to the xml buffer.
- * @param plist a pointer to the imported plist.
+     * @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);
+     */
+    PLIST_API void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist);
-/********************************************
- *                                          *
+    /********************************************
- *                 Utils                    *
+     *                                          *
- *                                          *
+     *                 Utils                    *
- ********************************************/
+     *                                          *
+     ********************************************/
-/**
- * Get a node from its path. Each path element depends on the associated father node type.
+    /**
- * For Dictionaries, var args are casted to const char*, for arrays, var args are caster to uint32_t
+     * Get a node from its path. Each path element depends on the associated father node type.
- * Search is breath first order.
+     * For Dictionaries, var args are casted to const char*, for arrays, var args are caster to uint32_t
- *
+     * Search is breath first order.
- * @param plist the node to access result from.
+     *
- * @param length length of the path to access
+     * @param plist the node to access result from.
- * @return the value to access.
+     * @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_API plist_t plist_access_path(plist_t plist, uint32_t length, ...);
-/**
- * Variadic version of #plist_access_path.
+    /**
- *
+     * Variadic version of #plist_access_path.
- * @param plist the node to access result from.
+     *
- * @param length length of the path to access
+     * @param plist the node to access result from.
- * @param v list of array's index and dic'st key
+     * @param length length of the path to access
- * @return the value to access.
+     * @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_API plist_t plist_access_pathv(plist_t plist, uint32_t length, va_list v);
-/**
- * Compare two node values
+    /**
- *
+     * Compare two node values
- * @param node_l left node to compare
+     *
- * @param node_r rigth node to compare
+     * @param node_l left node to compare
- * @return TRUE is type and value match, FALSE otherwise.
+     * @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);
+     */
+    PLIST_API char plist_compare_node_value(plist_t node_l, plist_t node_r);
 //DEPRECATED API BELOW
-/*@}*/
+    /*@}*/
-/**
+    /**
- * \defgroup DeprecatedAPI Deprecated libplist API
+     * \defgroup DeprecatedAPI Deprecated libplist API
- */
+     */
-/*@{*/
+    /*@{*/
-/********************************************
+    /********************************************
- *                                          *
+     *                                          *
- *            Tree navigation               *
+     *            Tree navigation               *
- *                                          *
+     *                                          *
- ********************************************/
+     ********************************************/
-/**
+    /**
- * Get the first child of a node
+     * Get the first child of a node
- *
+     *
- * @param node the first child
+     * @param node the first child
- */
+     */
-        PLIST_API plist_t plist_get_first_child(plist_t node);
+    PLIST_API plist_t plist_get_first_child(plist_t node);
-/**
+    /**
- * Get the next sibling of a node
+     * Get the next sibling of a node
- *
+     *
- * @param node the next sibling
+     * @param node the next sibling
- */
+     */
-        PLIST_API plist_t plist_get_next_sibling(plist_t node);
+    PLIST_API plist_t plist_get_next_sibling(plist_t node);
-/**
+    /**
- * Get the previous sibling of a node
+     * Get the previous sibling of a node
- *
+     *
- * @param node the previous sibling
+     * @param node the previous sibling
- */
+     */
-        PLIST_API plist_t plist_get_prev_sibling(plist_t node);
+    PLIST_API plist_t plist_get_prev_sibling(plist_t node);
-/**
+    /**
- * Get the nth child of a #PLIST_ARRAY node.
+     * Get the nth child of a #PLIST_ARRAY node.
- *
+     *
- * @param node the node of type #PLIST_ARRAY
+     * @param node the node of type #PLIST_ARRAY
- * @param n the index of the child to get. Range is [0, array_size[
+     * @param n the index of the child to get. Range is [0, array_size[
- * @return the nth children or NULL if node is not of type #PLIST_ARRAY
+     * @return the nth children or NULL if node is not of type #PLIST_ARRAY
- */
+     */
-        PLIST_API plist_t plist_get_array_nth_el(plist_t node, uint32_t n);
+    PLIST_API plist_t plist_get_array_nth_el(plist_t node, uint32_t n);
-/**
+    /**
- * Get the child of a #PLIST_DICT node from the associated key value.
+     * Get the child of a #PLIST_DICT node from the associated key value.
- *
+     *
- * @param node the node of type #PLIST_DICT
+     * @param node the node of type #PLIST_DICT
- * @param key the key associated to the requested value
+     * @param key the key associated to the requested value
- * @return the key associated value or NULL if node is not of type #PLIST_DICT
+     * @return the key associated value or NULL if node is not of type #PLIST_DICT
- */
+     */
-        PLIST_API plist_t plist_get_dict_el_from_key(plist_t node, const char *key);
+    PLIST_API plist_t plist_get_dict_el_from_key(plist_t node, const char *key);
-/********************************************
+    /********************************************
- *                                          *
+     *                                          *
- *                Setters                   *
+     *                Setters                   *
- *                                          *
+     *                                          *
- ********************************************/
+     ********************************************/
-/**
+    /**
- * Add a subnode to a node. The node must be of a structured type
+     * Add a subnode to a node. The node must be of a structured type
- * (ie #PLIST_DICT or #PLIST_ARRAY). This function fails silently
+     * (ie #PLIST_DICT or #PLIST_ARRAY). This function fails silently
- * if subnode already has a father.
+     * if subnode already has a father.
- *
+     *
- * @param node the node to add a children to
+     * @param node the node to add a children to
- * @param subnode the children node
+     * @param subnode the children node
- */
+     */
-        PLIST_API void plist_add_sub_node(plist_t node, plist_t subnode);
+    PLIST_API void plist_add_sub_node(plist_t node, plist_t subnode);
-/**
+    /**
- * Add a subnode of type #PLIST_KEY to a node. The node must be of a structured type
+     * Add a subnode of type #PLIST_KEY to a node. The node must be of a structured type
- * (ie #PLIST_DICT or #PLIST_ARRAY).
+     * (ie #PLIST_DICT or #PLIST_ARRAY).
- *
+     *
- * @param node the node to add a children to
+     * @param node the node to add a children to
- * @param val the key value encoded as an ASCII string (must be null terminated)
+     * @param val the key value encoded as an ASCII string (must be null terminated)
- */
+     */
-        PLIST_API void plist_add_sub_key_el(plist_t node, const char *val);
+    PLIST_API void plist_add_sub_key_el(plist_t node, const char *val);
-/**
+    /**
- * Add a subnode of type #PLIST_STRING to a node. The node must be of a structured type
+     * Add a subnode of type #PLIST_STRING to a node. The node must be of a structured type
- * (ie #PLIST_DICT or #PLIST_ARRAY).
+     * (ie #PLIST_DICT or #PLIST_ARRAY).
- *
+     *
- * @param node the node to add a children to
+     * @param node the node to add a children to
- * @param val the string value encoded as an ASCII or UTF-8 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);
+    PLIST_API void plist_add_sub_string_el(plist_t node, const char *val);
-/**
+    /**
- * Add a subnode of type #PLIST_BOOLEAN to a node. The node must be of a structured type
+     * Add a subnode of type #PLIST_BOOLEAN to a node. The node must be of a structured type
- * (ie #PLIST_DICT or #PLIST_ARRAY).
+     * (ie #PLIST_DICT or #PLIST_ARRAY).
- *
+     *
- * @param node the node to add a children to
+     * @param node the node to add a children to
- * @param val the boolean value (TRUE or FALSE)
+     * @param val the boolean value (TRUE or FALSE)
- */
+     */
-        PLIST_API void plist_add_sub_bool_el(plist_t node, uint8_t val);
+    PLIST_API void plist_add_sub_bool_el(plist_t node, uint8_t val);
-/**
+    /**
- * Add a subnode of type #PLIST_UINT to a node. The node must be of a structured type
+     * Add a subnode of type #PLIST_UINT to a node. The node must be of a structured type
- * (ie #PLIST_DICT or #PLIST_ARRAY).
+     * (ie #PLIST_DICT or #PLIST_ARRAY).
- *
+     *
- * @param node the node to add a children to
+     * @param node the node to add a children to
- * @param val the unsigned integer value
+     * @param val the unsigned integer value
- */
+     */
-        PLIST_API void plist_add_sub_uint_el(plist_t node, uint64_t val);
+    PLIST_API void plist_add_sub_uint_el(plist_t node, uint64_t val);
-/**
+    /**
- * Add a subnode of type #PLIST_REAL to a node. The node must be of a structured type
+     * Add a subnode of type #PLIST_REAL to a node. The node must be of a structured type
- * (ie #PLIST_DICT or #PLIST_ARRAY).
+     * (ie #PLIST_DICT or #PLIST_ARRAY).
- *
+     *
- * @param node the node to add a children to
+     * @param node the node to add a children to
- * @param val the real value
+     * @param val the real value
- */
+     */
-        PLIST_API void plist_add_sub_real_el(plist_t node, double val);
+    PLIST_API void plist_add_sub_real_el(plist_t node, double val);
-/**
+    /**
- * Add a subnode of type #PLIST_DATA to a node. The node must be of a structured type
+     * Add a subnode of type #PLIST_DATA to a node. The node must be of a structured type
- * (ie #PLIST_DICT or #PLIST_ARRAY).
+     * (ie #PLIST_DICT or #PLIST_ARRAY).
- *
+     *
- * @param node the node to add a children to
+     * @param node the node to add a children to
- * @param val the binary buffer
+     * @param val the binary buffer
- * @param length the length of the buffer
+     * @param length the length of the buffer
- */
+     */
-        PLIST_API void plist_add_sub_data_el(plist_t node, const char *val, uint64_t length);
+    PLIST_API void plist_add_sub_data_el(plist_t node, const char *val, uint64_t length);
-/**
+    /**
- * Add a subnode of type #PLIST_DATE to a node. The node must be of a structured type
+     * Add a subnode of type #PLIST_DATE to a node. The node must be of a structured type
- * (ie #PLIST_DICT or #PLIST_ARRAY).
+     * (ie #PLIST_DICT or #PLIST_ARRAY).
- *
+     *
- * @param node the node to add a children to
+     * @param node the node to add a children to
- * @param sec the number of seconds since 01/01/2001
+     * @param sec the number of seconds since 01/01/2001
- * @param usec the number of microseconds
+     * @param usec the number of microseconds
- */
+     */
-        PLIST_API void plist_add_sub_date_el(plist_t node, int32_t sec, int32_t usec);
+    PLIST_API void plist_add_sub_date_el(plist_t node, int32_t sec, int32_t usec);
-/********************************************
+    /********************************************
- *                                          *
+     *                                          *
- *                 Utils                    *
+     *                 Utils                    *
- *                                          *
+     *                                          *
- ********************************************/
+     ********************************************/
-/**
+    /**
- * Find the first encountered #PLIST_KEY node mathing that key.
+     * Find the first encountered #PLIST_KEY node mathing that key.
- * Search is breath first order.
+     * Search is breath first order.
- *
+     *
- * @param plist the root node of the plist structure.
+     * @param plist the root node of the plist structure.
- * @param value the ASCII Key to match.
+     * @param value the ASCII Key to match.
- */
+     */
-        PLIST_API plist_t plist_find_node_by_key(plist_t plist, const char *value);
+    PLIST_API plist_t plist_find_node_by_key(plist_t plist, const char *value);
-/**
+    /**
- * Find the first encountered #PLIST_STRING node mathing that string.
+     * Find the first encountered #PLIST_STRING node mathing that string.
- * Search is breath first order.
+     * Search is breath first order.
- *
+     *
- * @param plist the root node of the plist structure.
+     * @param plist the root node of the plist structure.
- * @param value the ASCII String to match.
+     * @param value the ASCII String to match.
- */
+     */
-        PLIST_API plist_t plist_find_node_by_string(plist_t plist, const char *value);
+    PLIST_API plist_t plist_find_node_by_string(plist_t plist, const char *value);
-/*@}*/
+    /*@}*/
 #ifdef __cplusplus
diff --git a/plutil/plutil.c b/plutil/plutil.c
index 75cd3f1..e9eaef1 100644
--- a/plutil/plutil.c
+++ b/plutil/plutil.c
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
@@ -35,114 +35,129 @@
 int main(int argc, char *argv[])
 {
-        FILE *iplist = NULL;
+    FILE *iplist = NULL;
-        plist_t root_node = NULL;
+    plist_t root_node = NULL;
-        char *plist_out = NULL;
+    char *plist_out = NULL;
-        int size = 0;
+    int size = 0;
-        char *plist_entire = NULL;
+    char *plist_entire = NULL;
-        struct stat *filestats = (struct stat *) malloc(sizeof(struct stat));
+    struct stat *filestats = (struct stat *) malloc(sizeof(struct stat));
-        Options *options = parse_arguments(argc, argv);
+    Options *options = parse_arguments(argc, argv);
-        if (!options) {
+    if (!options)
-                print_usage();
+    {
-                free(filestats);
+        print_usage();
-                return 0;
+        free(filestats);
-        }
+        return 0;
-        //read input file
+    }
-        iplist = fopen(options->in_file, "rb");
+    //read input file
-        if (!iplist)
+    iplist = fopen(options->in_file, "rb");
-                return 1;
+    if (!iplist)
-        stat(options->in_file, filestats);
+        return 1;
-        plist_entire = (char *) malloc(sizeof(char) * (filestats->st_size + 1));
+    stat(options->in_file, filestats);
-        fread(plist_entire, sizeof(char), filestats->st_size, iplist);
+    plist_entire = (char *) malloc(sizeof(char) * (filestats->st_size + 1));
-        fclose(iplist);
+    fread(plist_entire, sizeof(char), filestats->st_size, iplist);
+    fclose(iplist);
-        //convert one format to another
+    //convert one format to another
-        if (memcmp(plist_entire, "bplist00", 8) == 0) {
-                plist_from_bin(plist_entire, filestats->st_size, &root_node);
+    if (memcmp(plist_entire, "bplist00", 8) == 0)
-                plist_to_xml(root_node, &plist_out, &size);
+    {
-        } else {
+        plist_from_bin(plist_entire, filestats->st_size, &root_node);
-                plist_from_xml(plist_entire, filestats->st_size, &root_node);
+        plist_to_xml(root_node, &plist_out, &size);
-                plist_to_bin(root_node, &plist_out, &size);
+    }
-        }
+    else
-        plist_free(root_node);
+    {
-        free(plist_entire);
+        plist_from_xml(plist_entire, filestats->st_size, &root_node);
-        free(filestats);
+        plist_to_bin(root_node, &plist_out, &size);
+    }
-        if (plist_out) {
+    plist_free(root_node);
-                if (options->out_file != NULL) {
+    free(plist_entire);
-                        FILE *oplist = fopen(options->out_file, "wb");
+    free(filestats);
-                        if (!oplist)
-                                return 1;
+    if (plist_out)
-                        fwrite(plist_out, size, sizeof(char), oplist);
+    {
-                        fclose(oplist);
+        if (options->out_file != NULL)
-                }
+        {
-                //if no output file specified, write to stdout
+            FILE *oplist = fopen(options->out_file, "wb");
-                else
+            if (!oplist)
-                        fwrite(plist_out, size, sizeof(char), stdout);
+                return 1;
+            fwrite(plist_out, size, sizeof(char), oplist);
-                free(plist_out);
+            fclose(oplist);
-        } else
+        }
-                printf("ERROR\n");
+        //if no output file specified, write to stdout
+        else
-        free(options);
+            fwrite(plist_out, size, sizeof(char), stdout);
-        return 0;
+        free(plist_out);
+    }
+    else
+        printf("ERROR\n");
+    free(options);
+    return 0;
 }
 Options *parse_arguments(int argc, char *argv[])
 {
-        int i = 0;
+    int i = 0;
-        Options *options = (Options *) malloc(sizeof(Options));
+    Options *options = (Options *) malloc(sizeof(Options));
-        memset(options, 0, sizeof(Options));
+    memset(options, 0, sizeof(Options));
-        for (i = 1; i < argc; i++) {
+    for (i = 1; i < argc; i++)
-                if (!strcmp(argv[i], "--infile") || !strcmp(argv[i], "-i")) {
+    {
-                        if ((i + 1) == argc) {
+        if (!strcmp(argv[i], "--infile") || !strcmp(argv[i], "-i"))
-                                free(options);
+        {
-                                return NULL;
+            if ((i + 1) == argc)
-                        }
+            {
-                        options->in_file = argv[i + 1];
+                free(options);
-                        i++;
+                return NULL;
-                        continue;
+            }
-                }
+            options->in_file = argv[i + 1];
+            i++;
-                if (!strcmp(argv[i], "--outfile") || !strcmp(argv[i], "-o")) {
+            continue;
-                        if ((i + 1) == argc) {
+        }
-                                free(options);
-                                return NULL;
+        if (!strcmp(argv[i], "--outfile") || !strcmp(argv[i], "-o"))
-                        }
+        {
-                        options->out_file = argv[i + 1];
+            if ((i + 1) == argc)
-                        i++;
+            {
-                        continue;
+                free(options);
-                }
+                return NULL;
+            }
-                if (!strcmp(argv[i], "--debug") || !strcmp(argv[i], "-d") || !strcmp(argv[i], "-v")) {
+            options->out_file = argv[i + 1];
-                        options->debug = 1;
+            i++;
-                }
+            continue;
+        }
-                if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h")) {
-                        free(options);
+        if (!strcmp(argv[i], "--debug") || !strcmp(argv[i], "-d") || !strcmp(argv[i], "-v"))
-                        return NULL;
+        {
-                }
+            options->debug = 1;
-        }
+        }
-        if (!options->in_file /*|| !options->out_file */ ) {
+        if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h"))
-                free(options);
+        {
-                return NULL;
+            free(options);
-        }
+            return NULL;
+        }
-        return options;
+    }
+    if (!options->in_file /*|| !options->out_file */ )
+    {
+        free(options);
+        return NULL;
+    }
+    return options;
 }
 void print_usage()
 {
-        printf("Usage: plistutil -i|--infile in_file.plist -o|--outfile out_file.plist [--debug]\n");
+    printf("Usage: plistutil -i|--infile in_file.plist -o|--outfile out_file.plist [--debug]\n");
-        printf("\n");
+    printf("\n");
-        printf("\t-i or --infile: The file to read in.\n");
+    printf("\t-i or --infile: The file to read in.\n");
-        printf("\t-o or --outfile: The file to convert to.\n");
+    printf("\t-o or --outfile: The file to convert to.\n");
-        printf("\t-d, -v or --debug: Provide extended debug information.\n\n");
+    printf("\t-d, -v or --debug: Provide extended debug information.\n\n");
 }
diff --git a/plutil/plutil.h b/plutil/plutil.h
index 1455fb5..4be716e 100644
--- a/plutil/plutil.h
+++ b/plutil/plutil.h
@@ -8,20 +8,21 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-typedef struct _options {
+typedef struct _options
-        char *in_file, *out_file;
+{
-        uint8_t debug, in_fmt, out_fmt;
+    char *in_file, *out_file;
+    uint8_t debug, in_fmt, out_fmt;
 } Options;
 Options *parse_arguments(int argc, char *argv[]);
diff --git a/src/Array.cpp b/src/Array.cpp
index dbb1239..bdd26e1 100644
--- a/src/Array.cpp
+++ b/src/Array.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
@@ -37,7 +37,7 @@ Array::Array(plist_t node, Node* parent) : Structure(parent)
    for (uint32_t i = 0; i < size; i++)
    {
-        plist_t subnode = plist_array_get_item(_node, i);
+        plist_t subnode = plist_array_get_item(_node, i);
        _array.push_back(  Utils::FromPlist(subnode, this) );
    }
 }
@@ -50,7 +50,7 @@ Array::Array(PList::Array& a) : Structure()
    for (uint32_t i = 0; i < size; i++)
    {
-        plist_t subnode = plist_array_get_item(_node, i);
+        plist_t subnode = plist_array_get_item(_node, i);
        _array.push_back(  Utils::FromPlist(subnode, this) );
    }
 }
@@ -60,7 +60,7 @@ Array& Array::operator=(PList::Array& a)
    plist_free(_node);
    for (unsigned int it = 0; it < _array.size(); it++)
    {
-        delete _array.at(it);
+        delete _array.at(it);
    }
    _array.clear();
@@ -69,7 +69,7 @@ Array& Array::operator=(PList::Array& a)
    for (uint32_t i = 0; i < size; i++)
    {
-        plist_t subnode = plist_array_get_item(_node, i);
+        plist_t subnode = plist_array_get_item(_node, i);
        _array.push_back(  Utils::FromPlist(subnode, this) );
    }
    return *this;
@@ -77,11 +77,11 @@ Array& Array::operator=(PList::Array& a)
 Array::~Array()
 {
-     for (unsigned int it = 0; it < _array.size(); it++)
+    for (unsigned int it = 0; it < _array.size(); it++)
-     {
+    {
-        delete (_array.at(it));
+        delete (_array.at(it));
-     }
+    }
-     _array.clear();
+    _array.clear();
 }
 Node* Array::Clone()
@@ -98,10 +98,10 @@ void Array::Append(Node* node)
 {
    if (node)
    {
-        Node* clone = node->Clone();
+        Node* clone = node->Clone();
        clone->SetParent(this);
-        plist_array_append_item(_node, clone->GetPlist());
+        plist_array_append_item(_node, clone->GetPlist());
-        _array.push_back(clone);
+        _array.push_back(clone);
    }
 }
@@ -109,12 +109,12 @@ void Array::Insert(Node* node, unsigned int pos)
 {
    if (node)
    {
-        Node* clone = node->Clone();
+        Node* clone = node->Clone();
        clone->SetParent(this);
-        plist_array_insert_item(_node, clone->GetPlist(), pos);
+        plist_array_insert_item(_node, clone->GetPlist(), pos);
-        std::vector<Node*>::iterator it = _array.begin();
+        std::vector<Node*>::iterator it = _array.begin();
-        it += pos;
+        it += pos;
-        _array.insert(it, clone);
+        _array.insert(it, clone);
    }
 }
@@ -122,12 +122,12 @@ void Array::Remove(Node* node)
 {
    if (node)
    {
-        uint32_t pos = plist_array_get_item_index(node->GetPlist());
+        uint32_t pos = plist_array_get_item_index(node->GetPlist());
-        plist_array_remove_item(_node, pos);
+        plist_array_remove_item(_node, pos);
-        std::vector<Node*>::iterator it = _array.begin();
+        std::vector<Node*>::iterator it = _array.begin();
-        it += pos;
+        it += pos;
-        _array.erase(it);
+        _array.erase(it);
-        delete node;
+        delete node;
    }
 }
diff --git a/src/Boolean.cpp b/src/Boolean.cpp
index dfa96ca..e58472f 100644
--- a/src/Boolean.cpp
+++ b/src/Boolean.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
diff --git a/src/Data.cpp b/src/Data.cpp
index 02ce983..df5c1c7 100644
--- a/src/Data.cpp
+++ b/src/Data.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
diff --git a/src/Date.cpp b/src/Date.cpp
index cb817d9..2430184 100644
--- a/src/Date.cpp
+++ b/src/Date.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
diff --git a/src/Dictionary.cpp b/src/Dictionary.cpp
index 72307f1..fedce2e 100644
--- a/src/Dictionary.cpp
+++ b/src/Dictionary.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
@@ -41,11 +41,11 @@ Dictionary::Dictionary(plist_t node, Node* parent) : Structure(parent)
    while (subnode)
    {
        _map[std::string(key)] = Utils::FromPlist(subnode, this);
-        
-        subnode = NULL;
+        subnode = NULL;
-        free(key);
+        free(key);
-        key = NULL;
+        key = NULL;
-        plist_dict_next_item(_node, it, &key, &subnode);
+        plist_dict_next_item(_node, it, &key, &subnode);
    }
    free(it);
 }
@@ -54,8 +54,8 @@ Dictionary::Dictionary(PList::Dictionary& d) : Structure()
 {
    for (Dictionary::iterator it = _map.begin(); it != _map.end(); it++)
    {
-        plist_free(it->second->GetPlist());
+        plist_free(it->second->GetPlist());
-        delete it->second;
+        delete it->second;
    }
    _map.clear();
@@ -69,11 +69,11 @@ Dictionary::Dictionary(PList::Dictionary& d) : Structure()
    while (subnode)
    {
        _map[std::string(key)] = Utils::FromPlist(subnode, this);
-        
-        subnode = NULL;
+        subnode = NULL;
-        free(key);
+        free(key);
-        key = NULL;
+        key = NULL;
-        plist_dict_next_item(_node, it, NULL, &subnode);
+        plist_dict_next_item(_node, it, NULL, &subnode);
    }
    free(it);
 }
@@ -82,8 +82,8 @@ Dictionary& Dictionary::operator=(PList::Dictionary& d)
 {
    for (Dictionary::iterator it = _map.begin(); it != _map.end(); it++)
    {
-        plist_free(it->second->GetPlist());
+        plist_free(it->second->GetPlist());
-        delete it->second;
+        delete it->second;
    }
    _map.clear();
@@ -97,11 +97,11 @@ Dictionary& Dictionary::operator=(PList::Dictionary& d)
    while (subnode)
    {
        _map[std::string(key)] = Utils::FromPlist(subnode, this);
-        
-        subnode = NULL;
+        subnode = NULL;
-        free(key);
+        free(key);
-        key = NULL;
+        key = NULL;
-        plist_dict_next_item(_node, it, NULL, &subnode);
+        plist_dict_next_item(_node, it, NULL, &subnode);
    }
    free(it);
    return *this;
@@ -111,8 +111,8 @@ Dictionary::~Dictionary()
 {
    for (Dictionary::iterator it = _map.begin(); it != _map.end(); it++)
    {
-        plist_free(it->second->GetPlist());
+        plist_free(it->second->GetPlist());
-        delete it->second;
+        delete it->second;
    }
    _map.clear();
 }
@@ -146,12 +146,12 @@ Dictionary::iterator Dictionary::Insert(const std::string& key, Node* node)
 {
    if (node)
    {
-        Node* clone = node->Clone();
+        Node* clone = node->Clone();
        clone->SetParent(this);
-        plist_dict_insert_item(_node, key.c_str(), clone->GetPlist());
+        plist_dict_insert_item(_node, key.c_str(), clone->GetPlist());
-        delete _map[key];
+        delete _map[key];
-        _map[key] = clone;
+        _map[key] = clone;
-        return _map.find(key);
+        return _map.find(key);
    }
    return iterator(NULL);
 }
@@ -160,21 +160,21 @@ void Dictionary::Remove(Node* node)
 {
    if (node)
    {
-        char* key = NULL;
+        char* key = NULL;
-        plist_dict_get_item_key(node->GetPlist(), &key);
+        plist_dict_get_item_key(node->GetPlist(), &key);
-        plist_dict_remove_item(_node, key);
+        plist_dict_remove_item(_node, key);
-        std::string skey = key;
+        std::string skey = key;
-        free(key);
+        free(key);
-        _map.erase(skey);
+        _map.erase(skey);
-        delete node;
+        delete node;
    }
 }
 void Dictionary::Remove(const std::string& key)
 {
-        plist_dict_remove_item(_node, key.c_str());
+    plist_dict_remove_item(_node, key.c_str());
-        delete _map[key];
+    delete _map[key];
-        _map.erase(key);
+    _map.erase(key);
 }
 };
diff --git a/src/Integer.cpp b/src/Integer.cpp
index 4c8a825..fed03f6 100644
--- a/src/Integer.cpp
+++ b/src/Integer.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
diff --git a/src/Node.cpp b/src/Node.cpp
index c6a5b51..8ed3c6a 100644
--- a/src/Node.cpp
+++ b/src/Node.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
@@ -36,36 +36,37 @@ Node::Node(plist_t node, Node* parent) : _node(node), _parent(parent)
 Node::Node(plist_type type, Node* parent) : _parent(parent)
 {
    _node = NULL;
-    
-    switch(type) {
+    switch (type)
-        case PLIST_BOOLEAN:
+    {
-            _node = plist_new_bool(0);
+    case PLIST_BOOLEAN:
-            break;
+        _node = plist_new_bool(0);
-        case PLIST_UINT:
+        break;
-            _node = plist_new_uint(0);
+    case PLIST_UINT:
-            break;
+        _node = plist_new_uint(0);
-        case PLIST_REAL:
+        break;
-            _node = plist_new_real(0.);
+    case PLIST_REAL:
-            break;
+        _node = plist_new_real(0.);
-        case PLIST_STRING:
+        break;
-            _node = plist_new_string("");
+    case PLIST_STRING:
-            break;
+        _node = plist_new_string("");
-        case PLIST_DATA:
+        break;
-            _node = plist_new_data(NULL,0);
+    case PLIST_DATA:
-            break;
+        _node = plist_new_data(NULL,0);
-        case PLIST_DATE:
+        break;
-            _node = plist_new_date(0,0);
+    case PLIST_DATE:
-            break;
+        _node = plist_new_date(0,0);
-        case PLIST_ARRAY:
+        break;
-            _node = plist_new_array();
+    case PLIST_ARRAY:
-            break;
+        _node = plist_new_array();
-        case PLIST_DICT:
+        break;
-            _node = plist_new_dict();
+    case PLIST_DICT:
-            break;
+        _node = plist_new_dict();
-        case PLIST_KEY:
+        break;
-        case PLIST_NONE:
+    case PLIST_KEY:
-        default:
+    case PLIST_NONE:
-                break;
+    default:
+        break;
    }
 }
@@ -80,7 +81,7 @@ plist_type Node::GetType()
 {
    if (_node)
    {
-            return plist_get_node_type(_node);
+        return plist_get_node_type(_node);
    }
    return PLIST_NONE;
 }
diff --git a/src/Real.cpp b/src/Real.cpp
index 512c44e..768d07c 100644
--- a/src/Real.cpp
+++ b/src/Real.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
diff --git a/src/String.cpp b/src/String.cpp
index 3ae158e..bf65605 100644
--- a/src/String.cpp
+++ b/src/String.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
diff --git a/src/Structure.cpp b/src/Structure.cpp
index 5c7dc9a..872d396 100644
--- a/src/Structure.cpp
+++ b/src/Structure.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
@@ -41,11 +41,11 @@ uint32_t Structure::GetSize()
    plist_type type = plist_get_node_type(_node);
    if (type == PLIST_ARRAY)
    {
-        size = plist_array_get_size(_node);
+        size = plist_array_get_size(_node);
    }
    else if (type == PLIST_DICT)
    {
-        size = plist_dict_get_size(_node);
+        size = plist_dict_get_size(_node);
    }
    return size;
 }
diff --git a/src/Utils.cpp b/src/Utils.cpp
index df003e7..cb6da5e 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -7,15 +7,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include <stdlib.h>
@@ -38,36 +38,36 @@ Node* Utils::FromPlist(plist_t node, Node* parent)
    if (node)
    {
        plist_type type = plist_get_node_type(node);
-        switch(type)
+        switch (type)
-        {
+        {
-            case PLIST_DICT:
+        case PLIST_DICT:
-                ret = new Dictionary(node, parent);
+            ret = new Dictionary(node, parent);
-                break;
+            break;
-            case PLIST_ARRAY:
+        case PLIST_ARRAY:
-                ret = new Array(node, parent);
+            ret = new Array(node, parent);
-                break;
+            break;
-            case PLIST_BOOLEAN:
+        case PLIST_BOOLEAN:
-                ret = new Boolean(node, parent);
+            ret = new Boolean(node, parent);
-                break;
+            break;
-            case PLIST_UINT:
+        case PLIST_UINT:
-                ret = new Integer(node, parent);
+            ret = new Integer(node, parent);
-                break;
+            break;
-            case PLIST_REAL:
+        case PLIST_REAL:
-                ret = new Real(node, parent);
+            ret = new Real(node, parent);
-                break;
+            break;
-            case PLIST_STRING:
+        case PLIST_STRING:
-                ret = new String(node, parent);
+            ret = new String(node, parent);
-                break;
+            break;
-            case PLIST_DATE:
+        case PLIST_DATE:
-                ret = new Date(node, parent);
+            ret = new Date(node, parent);
-                break;
+            break;
-            case PLIST_DATA:
+        case PLIST_DATA:
-                ret = new Data(node, parent);
+            ret = new Data(node, parent);
-                break;
+            break;
-            default:
+        default:
-                plist_free(node);
+            plist_free(node);
-                break;
+            break;
-        }
+        }
    }
    return ret;
 }
diff --git a/src/bplist.c b/src/bplist.c
index 6e3007a..d37ed7a 100644
--- a/src/bplist.c
+++ b/src/bplist.c
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
@@ -44,46 +44,48 @@
 #define BPLIST_TRL_ROOTOBJ_IDX  10
 #define BPLIST_TRL_OFFTAB_IDX   18
-enum {
+enum
-        BPLIST_NULL = 0x00,
+{
-        BPLIST_FALSE = 0x08,
+    BPLIST_NULL = 0x00,
-        BPLIST_TRUE = 0x09,
+    BPLIST_FALSE = 0x08,
-        BPLIST_FILL = 0x0F,                     /* will be used for length grabbing */
+    BPLIST_TRUE = 0x09,
-        BPLIST_UINT = 0x10,
+    BPLIST_FILL = 0x0F,                 /* will be used for length grabbing */
-        BPLIST_REAL = 0x20,
+    BPLIST_UINT = 0x10,
-        BPLIST_DATE = 0x30,
+    BPLIST_REAL = 0x20,
-        BPLIST_DATA = 0x40,
+    BPLIST_DATE = 0x30,
-        BPLIST_STRING = 0x50,
+    BPLIST_DATA = 0x40,
-        BPLIST_UNICODE = 0x60,
+    BPLIST_STRING = 0x50,
-        BPLIST_UID = 0x70,
+    BPLIST_UNICODE = 0x60,
-        BPLIST_ARRAY = 0xA0,
+    BPLIST_UID = 0x70,
-        BPLIST_SET = 0xC0,
+    BPLIST_ARRAY = 0xA0,
-        BPLIST_DICT = 0xD0,
+    BPLIST_SET = 0xC0,
-        BPLIST_MASK = 0xF0
+    BPLIST_DICT = 0xD0,
+    BPLIST_MASK = 0xF0
 };
 static void byte_convert(uint8_t * address, size_t size)
 {
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-        uint8_t i = 0, j = 0;
+    uint8_t i = 0, j = 0;
-        uint8_t tmp = 0;
+    uint8_t tmp = 0;
-        for (i = 0; i < (size / 2); i++) {
+    for (i = 0; i < (size / 2); i++)
-                tmp = address[i];
+    {
-                j = ((size - 1) + 0) - i;
+        tmp = address[i];
-                address[i] = address[j];
+        j = ((size - 1) + 0) - i;
-                address[j] = tmp;
+        address[i] = address[j];
-        }
+        address[j] = tmp;
+    }
 #endif
 }
 static uint32_t uint24_from_be(char *buff)
 {
-        uint32_t ret = 0;
+    uint32_t ret = 0;
-        char *tmp = (char *) &ret;
+    char *tmp = (char *) &ret;
-        memcpy(tmp + 1, buff, 3 * sizeof(char));
+    memcpy(tmp + 1, buff, 3 * sizeof(char));
-        byte_convert(tmp, sizeof(uint32_t));
+    byte_convert(tmp, sizeof(uint32_t));
-        return ret;
+    return ret;
 }
 #define UINT_TO_HOST(x, n) \
@@ -106,787 +108,822 @@ static uint32_t uint24_from_be(char *buff)
 static plist_t parse_uint_node(char *bnode, uint8_t size, char **next_object)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        size = 1 << size;                       // make length less misleading
+    size = 1 << size;                   // make length less misleading
-        switch (size) {
+    switch (size)
-        case sizeof(uint8_t):
+    {
-        case sizeof(uint16_t):
+    case sizeof(uint8_t):
-        case sizeof(uint32_t):
+    case sizeof(uint16_t):
-        case sizeof(uint64_t):
+    case sizeof(uint32_t):
-                memcpy(&data->intval, bnode, size);
+    case sizeof(uint64_t):
-                data->intval = UINT_TO_HOST(&data->intval, size);
+        memcpy(&data->intval, bnode, size);
-                break;
+        data->intval = UINT_TO_HOST(&data->intval, size);
-        default:
+        break;
-                free(data);
+    default:
-                return NULL;
+        free(data);
-        };
+        return NULL;
+    };
-        *next_object = bnode + size;
-        data->type = PLIST_UINT;
+    *next_object = bnode + size;
-        data->length = sizeof(uint64_t);
+    data->type = PLIST_UINT;
+    data->length = sizeof(uint64_t);
-        return g_node_new(data);
+    return g_node_new(data);
 }
 static plist_t parse_real_node(char *bnode, uint8_t size)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        float floatval = 0.0;
+    float floatval = 0.0;
-        size = 1 << size;                       // make length less misleading
+    size = 1 << size;                   // make length less misleading
-        switch (size) {
+    switch (size)
-        case sizeof(float):
+    {
-                floatval = *(float *) bnode;
+    case sizeof(float):
-                byte_convert((uint8_t *) & floatval, sizeof(float));
+        floatval = *(float *) bnode;
-                data->realval = floatval;
+        byte_convert((uint8_t *) & floatval, sizeof(float));
-                break;
+        data->realval = floatval;
-        case sizeof(double):
+        break;
-                data->realval = *(double *) bnode;
+    case sizeof(double):
-                byte_convert((uint8_t *) & (data->realval), sizeof(double));
+        data->realval = *(double *) bnode;
-                break;
+        byte_convert((uint8_t *) & (data->realval), sizeof(double));
-        default:
+        break;
-                free(data);
+    default:
-                return NULL;
+        free(data);
-        }
+        return NULL;
-        data->type = PLIST_REAL;
+    }
-        data->length = sizeof(double);
+    data->type = PLIST_REAL;
+    data->length = sizeof(double);
-        return g_node_new(data);
+    return g_node_new(data);
 }
 static plist_t parse_date_node(char *bnode, uint8_t size)
 {
-        plist_t node = parse_real_node(bnode, size);
+    plist_t node = parse_real_node(bnode, size);
-        plist_data_t data = plist_get_data(node);
+    plist_data_t data = plist_get_data(node);
-        double time_real = data->realval;
+    double time_real = data->realval;
-        data->timeval.tv_sec = (glong) time_real;
+    data->timeval.tv_sec = (glong) time_real;
-        data->timeval.tv_usec = (time_real - (glong) time_real) * G_USEC_PER_SEC;
+    data->timeval.tv_usec = (time_real - (glong) time_real) * G_USEC_PER_SEC;
-        data->type = PLIST_DATE;
+    data->type = PLIST_DATE;
-        data->length = sizeof(GTimeVal);
+    data->length = sizeof(GTimeVal);
-        return node;
+    return node;
 }
 static plist_t parse_string_node(char *bnode, uint64_t size)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_STRING;
+    data->type = PLIST_STRING;
-        data->strval = (char *) malloc(sizeof(char) * (size + 1));
+    data->strval = (char *) malloc(sizeof(char) * (size + 1));
-        memcpy(data->strval, bnode, size);
+    memcpy(data->strval, bnode, size);
-        data->strval[size] = '\0';
+    data->strval[size] = '\0';
-        data->length = strlen(data->strval);
+    data->length = strlen(data->strval);
-        return g_node_new(data);
+    return g_node_new(data);
 }
 static plist_t parse_unicode_node(char *bnode, uint64_t size)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        uint64_t i = 0;
+    uint64_t i = 0;
-        gunichar2 *unicodestr = NULL;
+    gunichar2 *unicodestr = NULL;
-        gchar *tmpstr = NULL;
+    gchar *tmpstr = NULL;
-        int type = 0;
+    int type = 0;
-        glong items_read = 0;
+    glong items_read = 0;
-        glong items_written = 0;
+    glong items_written = 0;
-        GError *error = NULL;
+    GError *error = NULL;
-        data->type = PLIST_STRING;
+    data->type = PLIST_STRING;
-        unicodestr = (gunichar2 *) malloc(sizeof(gunichar2) * size);
+    unicodestr = (gunichar2 *) malloc(sizeof(gunichar2) * size);
-        memcpy(unicodestr, bnode, sizeof(gunichar2) * size);
+    memcpy(unicodestr, bnode, sizeof(gunichar2) * size);
-        for (i = 0; i < size; i++)
+    for (i = 0; i < size; i++)
-                byte_convert((uint8_t *) (unicodestr + i), sizeof(gunichar2));
+        byte_convert((uint8_t *) (unicodestr + i), sizeof(gunichar2));
-        tmpstr = g_utf16_to_utf8(unicodestr, size, &items_read, &items_written, &error);
+    tmpstr = g_utf16_to_utf8(unicodestr, size, &items_read, &items_written, &error);
-        free(unicodestr);
+    free(unicodestr);
-        data->type = PLIST_STRING;
+    data->type = PLIST_STRING;
-        data->strval = (char *) malloc(sizeof(char) * (items_written + 1));
+    data->strval = (char *) malloc(sizeof(char) * (items_written + 1));
-        memcpy(data->strval, tmpstr, items_written);
+    memcpy(data->strval, tmpstr, items_written);
-        data->strval[items_written] = '\0';
+    data->strval[items_written] = '\0';
-        data->length = strlen(data->strval);
+    data->length = strlen(data->strval);
-        g_free(tmpstr);
+    g_free(tmpstr);
-        return g_node_new(data);
+    return g_node_new(data);
 }
 static plist_t parse_data_node(char *bnode, uint64_t size)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_DATA;
+    data->type = PLIST_DATA;
-        data->length = size;
+    data->length = size;
-        data->buff = (uint8_t *) malloc(sizeof(uint8_t) * size);
+    data->buff = (uint8_t *) malloc(sizeof(uint8_t) * size);
-        memcpy(data->buff, bnode, sizeof(uint8_t) * size);
+    memcpy(data->buff, bnode, sizeof(uint8_t) * size);
-        return g_node_new(data);
+    return g_node_new(data);
 }
 static plist_t parse_dict_node(char *bnode, uint64_t size, uint32_t ref_size)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_DICT;
+    data->type = PLIST_DICT;
-        data->length = size;
+    data->length = size;
-        data->buff = (uint8_t *) malloc(sizeof(uint8_t) * size * ref_size * 2);
+    data->buff = (uint8_t *) malloc(sizeof(uint8_t) * size * ref_size * 2);
-        memcpy(data->buff, bnode, sizeof(uint8_t) * size * ref_size * 2);
+    memcpy(data->buff, bnode, sizeof(uint8_t) * size * ref_size * 2);
-        return g_node_new(data);
+    return g_node_new(data);
 }
 static plist_t parse_array_node(char *bnode, uint64_t size, uint32_t ref_size)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_ARRAY;
+    data->type = PLIST_ARRAY;
-        data->length = size;
+    data->length = size;
-        data->buff = (uint8_t *) malloc(sizeof(uint8_t) * size * ref_size);
+    data->buff = (uint8_t *) malloc(sizeof(uint8_t) * size * ref_size);
-        memcpy(data->buff, bnode, sizeof(uint8_t) * size * ref_size);
+    memcpy(data->buff, bnode, sizeof(uint8_t) * size * ref_size);
-        return g_node_new(data);
+    return g_node_new(data);
 }
 static plist_t parse_bin_node(char *object, uint8_t dict_size, char **next_object)
 {
-        uint16_t type = 0;
+    uint16_t type = 0;
-        uint64_t size = 0;
+    uint64_t size = 0;
-        if (!object)
+    if (!object)
-                return NULL;
+        return NULL;
-        type = (*object) & 0xF0;
+    type = (*object) & 0xF0;
-        size = (*object) & 0x0F;
+    size = (*object) & 0x0F;
-        object++;
+    object++;
-        switch (type) {
+    switch (type)
+    {
-        case BPLIST_NULL:
-                switch (size) {
+    case BPLIST_NULL:
+        switch (size)
-                case BPLIST_TRUE:
+        {
-                        {
-                                plist_data_t data = plist_new_plist_data();
+        case BPLIST_TRUE:
-                                data->type = PLIST_BOOLEAN;
+        {
-                                data->boolval = TRUE;
+            plist_data_t data = plist_new_plist_data();
-                                data->length = 1;
+            data->type = PLIST_BOOLEAN;
-                                return g_node_new(data);
+            data->boolval = TRUE;
-                        }
+            data->length = 1;
+            return g_node_new(data);
-                case BPLIST_FALSE:
+        }
-                        {
-                                plist_data_t data = plist_new_plist_data();
+        case BPLIST_FALSE:
-                                data->type = PLIST_BOOLEAN;
+        {
-                                data->boolval = FALSE;
+            plist_data_t data = plist_new_plist_data();
-                                data->length = 1;
+            data->type = PLIST_BOOLEAN;
-                                return g_node_new(data);
+            data->boolval = FALSE;
-                        }
+            data->length = 1;
+            return g_node_new(data);
-                case BPLIST_NULL:
+        }
-                default:
-                        return NULL;
+        case BPLIST_NULL:
-                }
+        default:
+            return NULL;
-        case BPLIST_UINT:
+        }
-                return parse_uint_node(object, size, next_object);
+    case BPLIST_UINT:
-        case BPLIST_REAL:
+        return parse_uint_node(object, size, next_object);
-                return parse_real_node(object, size);
+    case BPLIST_REAL:
-        case BPLIST_DATE:
+        return parse_real_node(object, size);
-                if (3 != size)
-                        return NULL;
+    case BPLIST_DATE:
-                else
+        if (3 != size)
-                        return parse_date_node(object, size);
+            return NULL;
+        else
-        case BPLIST_DATA:
+            return parse_date_node(object, size);
-                if (0x0F == size) {
-                        plist_t size_node = parse_bin_node(object, dict_size, &object);
+    case BPLIST_DATA:
-                        if (plist_get_node_type(size_node) != PLIST_UINT)
+        if (0x0F == size)
-                                return NULL;
+        {
-                        plist_get_uint_val(size_node, &size);
+            plist_t size_node = parse_bin_node(object, dict_size, &object);
-                        plist_free(size_node);
+            if (plist_get_node_type(size_node) != PLIST_UINT)
-                }
+                return NULL;
-                return parse_data_node(object, size);
+            plist_get_uint_val(size_node, &size);
+            plist_free(size_node);
-        case BPLIST_STRING:
+        }
-                if (0x0F == size) {
+        return parse_data_node(object, size);
-                        plist_t size_node = parse_bin_node(object, dict_size, &object);
-                        if (plist_get_node_type(size_node) != PLIST_UINT)
+    case BPLIST_STRING:
-                                return NULL;
+        if (0x0F == size)
-                        plist_get_uint_val(size_node, &size);
+        {
-                        plist_free(size_node);
+            plist_t size_node = parse_bin_node(object, dict_size, &object);
-                }
+            if (plist_get_node_type(size_node) != PLIST_UINT)
-                return parse_string_node(object, size);
+                return NULL;
+            plist_get_uint_val(size_node, &size);
-        case BPLIST_UNICODE:
+            plist_free(size_node);
-                if (0x0F == size) {
+        }
-                        plist_t size_node = parse_bin_node(object, dict_size, &object);
+        return parse_string_node(object, size);
-                        if (plist_get_node_type(size_node) != PLIST_UINT)
-                                return NULL;
+    case BPLIST_UNICODE:
-                        plist_get_uint_val(size_node, &size);
+        if (0x0F == size)
-                        plist_free(size_node);
+        {
-                }
+            plist_t size_node = parse_bin_node(object, dict_size, &object);
-                return parse_unicode_node(object, size);
+            if (plist_get_node_type(size_node) != PLIST_UINT)
+                return NULL;
-        case BPLIST_UID:
+            plist_get_uint_val(size_node, &size);
-        case BPLIST_ARRAY:
+            plist_free(size_node);
-                if (0x0F == size) {
+        }
-                        plist_t size_node = parse_bin_node(object, dict_size, &object);
+        return parse_unicode_node(object, size);
-                        if (plist_get_node_type(size_node) != PLIST_UINT)
-                                return NULL;
+    case BPLIST_UID:
-                        plist_get_uint_val(size_node, &size);
+    case BPLIST_ARRAY:
-                        plist_free(size_node);
+        if (0x0F == size)
-                }
+        {
-                return parse_array_node(object, size, dict_size);
+            plist_t size_node = parse_bin_node(object, dict_size, &object);
+            if (plist_get_node_type(size_node) != PLIST_UINT)
-        case BPLIST_SET:
+                return NULL;
-        case BPLIST_DICT:
+            plist_get_uint_val(size_node, &size);
-                if (0x0F == size) {
+            plist_free(size_node);
-                        plist_t size_node = parse_bin_node(object, dict_size, &object);
+        }
-                        if (plist_get_node_type(size_node) != PLIST_UINT)
+        return parse_array_node(object, size, dict_size);
-                                return NULL;
-                        plist_get_uint_val(size_node, &size);
+    case BPLIST_SET:
-                        plist_free(size_node);
+    case BPLIST_DICT:
-                }
+        if (0x0F == size)
-                return parse_dict_node(object, size, dict_size);
+        {
-        default:
+            plist_t size_node = parse_bin_node(object, dict_size, &object);
-                return NULL;
+            if (plist_get_node_type(size_node) != PLIST_UINT)
-        }
+                return NULL;
-        return NULL;
+            plist_get_uint_val(size_node, &size);
+            plist_free(size_node);
+        }
+        return parse_dict_node(object, size, dict_size);
+    default:
+        return NULL;
+    }
+    return NULL;
 }
 static gpointer copy_plist_data(gconstpointer src, gpointer data)
 {
-        plist_data_t srcdata = (plist_data_t) src;
+    plist_data_t srcdata = (plist_data_t) src;
-        plist_data_t dstdata = plist_new_plist_data();
+    plist_data_t dstdata = plist_new_plist_data();
-        dstdata->type = srcdata->type;
+    dstdata->type = srcdata->type;
-        dstdata->length = srcdata->length;
+    dstdata->length = srcdata->length;
-        switch (dstdata->type) {
+    switch (dstdata->type)
-        case PLIST_BOOLEAN:
+    {
-                dstdata->boolval = srcdata->boolval;
+    case PLIST_BOOLEAN:
-                break;
+        dstdata->boolval = srcdata->boolval;
-        case PLIST_UINT:
+        break;
-                dstdata->intval = srcdata->intval;
+    case PLIST_UINT:
-                break;
+        dstdata->intval = srcdata->intval;
-        case PLIST_DATE:
+        break;
-                dstdata->timeval.tv_sec = srcdata->timeval.tv_sec;
+    case PLIST_DATE:
-                dstdata->timeval.tv_usec = srcdata->timeval.tv_usec;
+        dstdata->timeval.tv_sec = srcdata->timeval.tv_sec;
-                break;
+        dstdata->timeval.tv_usec = srcdata->timeval.tv_usec;
-        case PLIST_REAL:
+        break;
-                dstdata->realval = srcdata->realval;
+    case PLIST_REAL:
-                break;
+        dstdata->realval = srcdata->realval;
-        case PLIST_KEY:
+        break;
-        case PLIST_STRING:
+    case PLIST_KEY:
-                dstdata->strval = strdup(srcdata->strval);
+    case PLIST_STRING:
-                break;
+        dstdata->strval = strdup(srcdata->strval);
-        case PLIST_DATA:
+        break;
-        case PLIST_ARRAY:
+    case PLIST_DATA:
-                dstdata->buff = (uint8_t *) malloc(sizeof(uint8_t *) * srcdata->length);
+    case PLIST_ARRAY:
-                memcpy(dstdata->buff, srcdata->buff, sizeof(uint8_t *) * srcdata->length);
+        dstdata->buff = (uint8_t *) malloc(sizeof(uint8_t *) * srcdata->length);
-                break;
+        memcpy(dstdata->buff, srcdata->buff, sizeof(uint8_t *) * srcdata->length);
-        case PLIST_DICT:
+        break;
-                dstdata->buff = (uint8_t *) malloc(sizeof(uint8_t *) * srcdata->length * 2);
+    case PLIST_DICT:
-                memcpy(dstdata->buff, srcdata->buff, sizeof(uint8_t *) * srcdata->length * 2);
+        dstdata->buff = (uint8_t *) malloc(sizeof(uint8_t *) * srcdata->length * 2);
-                break;
+        memcpy(dstdata->buff, srcdata->buff, sizeof(uint8_t *) * srcdata->length * 2);
-        default:
+        break;
-                break;
+    default:
-        }
+        break;
+    }
-        return dstdata;
+    return dstdata;
 }
 void plist_from_bin(const char *plist_bin, uint32_t length, plist_t * plist)
 {
-        char *trailer = NULL;
+    char *trailer = NULL;
-        uint8_t offset_size = 0;
+    uint8_t offset_size = 0;
-        uint8_t dict_param_size = 0;
+    uint8_t dict_param_size = 0;
-        uint64_t num_objects = 0;
+    uint64_t num_objects = 0;
-        uint64_t root_object = 0;
+    uint64_t root_object = 0;
-        uint64_t offset_table_index = 0;
+    uint64_t offset_table_index = 0;
-        plist_t *nodeslist = NULL;
+    plist_t *nodeslist = NULL;
-        uint64_t i = 0;
+    uint64_t i = 0;
-        uint64_t current_offset = 0;
+    uint64_t current_offset = 0;
-        char *offset_table = NULL;
+    char *offset_table = NULL;
-        uint32_t j = 0, str_i = 0, str_j = 0;
+    uint32_t j = 0, str_i = 0, str_j = 0;
-        uint32_t index1 = 0, index2 = 0;
+    uint32_t index1 = 0, index2 = 0;
-        //first check we have enough data
+    //first check we have enough data
-        if (!(length >= BPLIST_MAGIC_SIZE + BPLIST_VERSION_SIZE + BPLIST_TRL_SIZE))
+    if (!(length >= BPLIST_MAGIC_SIZE + BPLIST_VERSION_SIZE + BPLIST_TRL_SIZE))
-                return;
+        return;
-        //check that plist_bin in actually a plist
+    //check that plist_bin in actually a plist
-        if (memcmp(plist_bin, BPLIST_MAGIC, BPLIST_MAGIC_SIZE) != 0)
+    if (memcmp(plist_bin, BPLIST_MAGIC, BPLIST_MAGIC_SIZE) != 0)
-                return;
+        return;
-        //check for known version
+    //check for known version
-        if (memcmp(plist_bin + BPLIST_MAGIC_SIZE, BPLIST_VERSION, BPLIST_VERSION_SIZE) != 0)
+    if (memcmp(plist_bin + BPLIST_MAGIC_SIZE, BPLIST_VERSION, BPLIST_VERSION_SIZE) != 0)
-                return;
+        return;
-        //now parse trailer
+    //now parse trailer
-        trailer = (char *) (plist_bin + (length - BPLIST_TRL_SIZE));
+    trailer = (char *) (plist_bin + (length - BPLIST_TRL_SIZE));
-        offset_size = trailer[BPLIST_TRL_OFFSIZE_IDX];
+    offset_size = trailer[BPLIST_TRL_OFFSIZE_IDX];
-        dict_param_size = trailer[BPLIST_TRL_PARMSIZE_IDX];
+    dict_param_size = trailer[BPLIST_TRL_PARMSIZE_IDX];
-        num_objects = be64dec(trailer + BPLIST_TRL_NUMOBJ_IDX);
+    num_objects = be64dec(trailer + BPLIST_TRL_NUMOBJ_IDX);
-        root_object = be64dec(trailer + BPLIST_TRL_ROOTOBJ_IDX);
+    root_object = be64dec(trailer + BPLIST_TRL_ROOTOBJ_IDX);
-        offset_table_index = be64dec(trailer + BPLIST_TRL_OFFTAB_IDX);
+    offset_table_index = be64dec(trailer + BPLIST_TRL_OFFTAB_IDX);
-        if (num_objects == 0)
+    if (num_objects == 0)
-                return;
+        return;
-        //allocate serialized array of nodes
+    //allocate serialized array of nodes
-        nodeslist = (plist_t *) malloc(sizeof(plist_t) * num_objects);
+    nodeslist = (plist_t *) malloc(sizeof(plist_t) * num_objects);
-        if (!nodeslist)
+    if (!nodeslist)
-                return;
+        return;
-        //parse serialized nodes
+    //parse serialized nodes
-        offset_table = (char *) (plist_bin + offset_table_index);
+    offset_table = (char *) (plist_bin + offset_table_index);
-        for (i = 0; i < num_objects; i++) {
+    for (i = 0; i < num_objects; i++)
-                char *obj = NULL;
+    {
-                current_offset = UINT_TO_HOST(offset_table + i * offset_size, offset_size);
+        char *obj = NULL;
+        current_offset = UINT_TO_HOST(offset_table + i * offset_size, offset_size);
-                obj = (char *) (plist_bin + current_offset);
-                nodeslist[i] = parse_bin_node(obj, dict_param_size, &obj);
+        obj = (char *) (plist_bin + current_offset);
-        }
+        nodeslist[i] = parse_bin_node(obj, dict_param_size, &obj);
+    }
-        //setup children for structured types
-        for (i = 0; i < num_objects; i++) {
+    //setup children for structured types
+    for (i = 0; i < num_objects; i++)
-                plist_data_t data = plist_get_data(nodeslist[i]);
+    {
-                switch (data->type) {
+        plist_data_t data = plist_get_data(nodeslist[i]);
-                case PLIST_DICT:
-                        for (j = 0; j < data->length; j++) {
+        switch (data->type)
-                                str_i = j * dict_param_size;
+        {
-                                str_j = (j + data->length) * dict_param_size;
+        case PLIST_DICT:
+            for (j = 0; j < data->length; j++)
-                                index1 = UINT_TO_HOST(data->buff + str_i, dict_param_size);
+            {
-                                index2 = UINT_TO_HOST(data->buff + str_j, dict_param_size);
+                str_i = j * dict_param_size;
+                str_j = (j + data->length) * dict_param_size;
-                                //first one is actually a key
-                                plist_get_data(nodeslist[index1])->type = PLIST_KEY;
+                index1 = UINT_TO_HOST(data->buff + str_i, dict_param_size);
+                index2 = UINT_TO_HOST(data->buff + str_j, dict_param_size);
-                                if (index1 < num_objects) {
-                                        if (G_NODE_IS_ROOT(nodeslist[index1]))
+                //first one is actually a key
-                                                g_node_append(nodeslist[i], nodeslist[index1]);
+                plist_get_data(nodeslist[index1])->type = PLIST_KEY;
-                                        else
-                                                g_node_append(nodeslist[i], g_node_copy_deep(nodeslist[index1], copy_plist_data, NULL));
+                if (index1 < num_objects)
-                                }
+                {
+                    if (G_NODE_IS_ROOT(nodeslist[index1]))
-                                if (index2 < num_objects) {
+                        g_node_append(nodeslist[i], nodeslist[index1]);
-                                        if (G_NODE_IS_ROOT(nodeslist[index2]))
+                    else
-                                                g_node_append(nodeslist[i], nodeslist[index2]);
+                        g_node_append(nodeslist[i], g_node_copy_deep(nodeslist[index1], copy_plist_data, NULL));
-                                        else
+                }
-                                                g_node_append(nodeslist[i], g_node_copy_deep(nodeslist[index2], copy_plist_data, NULL));
-                                }
+                if (index2 < num_objects)
-                        }
+                {
+                    if (G_NODE_IS_ROOT(nodeslist[index2]))
-                        free(data->buff);
+                        g_node_append(nodeslist[i], nodeslist[index2]);
-                        break;
+                    else
+                        g_node_append(nodeslist[i], g_node_copy_deep(nodeslist[index2], copy_plist_data, NULL));
-                case PLIST_ARRAY:
+                }
-                        for (j = 0; j < data->length; j++) {
+            }
-                                str_j = j * dict_param_size;
-                                index1 = UINT_TO_HOST(data->buff + str_j, dict_param_size);
+            free(data->buff);
+            break;
-                                if (index1 < num_objects) {
-                                        if (G_NODE_IS_ROOT(nodeslist[index1]))
+        case PLIST_ARRAY:
-                                                g_node_append(nodeslist[i], nodeslist[index1]);
+            for (j = 0; j < data->length; j++)
-                                        else
+            {
-                                                g_node_append(nodeslist[i], g_node_copy_deep(nodeslist[index1], copy_plist_data, NULL));
+                str_j = j * dict_param_size;
-                                }
+                index1 = UINT_TO_HOST(data->buff + str_j, dict_param_size);
-                        }
-                        free(data->buff);
+                if (index1 < num_objects)
-                        break;
+                {
-                default:
+                    if (G_NODE_IS_ROOT(nodeslist[index1]))
-                        break;
+                        g_node_append(nodeslist[i], nodeslist[index1]);
-                }
+                    else
-        }
+                        g_node_append(nodeslist[i], g_node_copy_deep(nodeslist[index1], copy_plist_data, NULL));
+                }
-        *plist = nodeslist[root_object];
+            }
-        free(nodeslist);
+            free(data->buff);
+            break;
+        default:
+            break;
+        }
+    }
+    *plist = nodeslist[root_object];
+    free(nodeslist);
 }
 static guint plist_data_hash(gconstpointer key)
 {
-        plist_data_t data = plist_get_data((plist_t) key);
+    plist_data_t data = plist_get_data((plist_t) key);
-        guint hash = data->type;
+    guint hash = data->type;
-        guint i = 0;
+    guint i = 0;
-        char *buff = NULL;
+    char *buff = NULL;
-        guint size = 0;
+    guint size = 0;
-        switch (data->type) {
+    switch (data->type)
-        case PLIST_BOOLEAN:
+    {
-        case PLIST_UINT:
+    case PLIST_BOOLEAN:
-        case PLIST_REAL:
+    case PLIST_UINT:
-                buff = (char *) &data->intval;  //works also for real as we use an union
+    case PLIST_REAL:
-                size = 8;
+        buff = (char *) &data->intval;  //works also for real as we use an union
-                break;
+        size = 8;
-        case PLIST_KEY:
+        break;
-        case PLIST_STRING:
+    case PLIST_KEY:
-                buff = data->strval;
+    case PLIST_STRING:
-                size = strlen(buff);
+        buff = data->strval;
-                break;
+        size = strlen(buff);
-        case PLIST_DATA:
+        break;
-        case PLIST_ARRAY:
+    case PLIST_DATA:
-        case PLIST_DICT:
+    case PLIST_ARRAY:
-                //for these types only hash pointer
+    case PLIST_DICT:
-                buff = (char *) &key;
+        //for these types only hash pointer
-                size = sizeof(gconstpointer);
+        buff = (char *) &key;
-                break;
+        size = sizeof(gconstpointer);
-        case PLIST_DATE:
+        break;
-                buff = (char *) &(data->timeval);
+    case PLIST_DATE:
-                size = data->length;
+        buff = (char *) &(data->timeval);
-                break;
+        size = data->length;
-        default:
+        break;
-                break;
+    default:
-        }
+        break;
+    }
-        //now perform hash
-        for (i = 0; i < size; buff++, i++)
+    //now perform hash
-                hash = hash << 7 ^ (*buff);
+    for (i = 0; i < size; buff++, i++)
+        hash = hash << 7 ^ (*buff);
-        return hash;
+    return hash;
 }
-struct serialize_s {
+struct serialize_s
-        GPtrArray *objects;
+{
-        GHashTable *ref_table;
+    GPtrArray *objects;
+    GHashTable *ref_table;
 };
 static void serialize_plist(GNode * node, gpointer data)
 {
-        uint64_t *index_val = NULL;
+    uint64_t *index_val = NULL;
-        struct serialize_s *ser = (struct serialize_s *) data;
+    struct serialize_s *ser = (struct serialize_s *) data;
-        uint64_t current_index = ser->objects->len;
+    uint64_t current_index = ser->objects->len;
-        //first check that node is not yet in objects
+    //first check that node is not yet in objects
-        gpointer val = g_hash_table_lookup(ser->ref_table, node);
+    gpointer val = g_hash_table_lookup(ser->ref_table, node);
-        if (val) {
+    if (val)
-                //data is already in table
+    {
-                return;
+        //data is already in table
-        }
+        return;
-        //insert new ref
+    }
-        index_val = (uint64_t *) malloc(sizeof(uint64_t));
+    //insert new ref
-        *index_val = current_index;
+    index_val = (uint64_t *) malloc(sizeof(uint64_t));
-        g_hash_table_insert(ser->ref_table, node, index_val);
+    *index_val = current_index;
+    g_hash_table_insert(ser->ref_table, node, index_val);
-        //now append current node to object array
-        g_ptr_array_add(ser->objects, node);
+    //now append current node to object array
+    g_ptr_array_add(ser->objects, node);
-        //now recurse on children
-        g_node_children_foreach(node, G_TRAVERSE_ALL, serialize_plist, data);
+    //now recurse on children
-        return;
+    g_node_children_foreach(node, G_TRAVERSE_ALL, serialize_plist, data);
+    return;
 }
 static gboolean free_index(gpointer key, gpointer value, gpointer user_data)
 {
-        free((uint64_t *) value);
+    free((uint64_t *) value);
-        return TRUE;
+    return TRUE;
 }
 #define Log2(x) (x == 8 ? 3 : (x == 4 ? 2 : (x == 2 ? 1 : 0)))
 static void write_int(GByteArray * bplist, uint64_t val)
 {
-        uint64_t size = get_needed_bytes(val);
+    uint64_t size = get_needed_bytes(val);
-        uint8_t *buff = NULL;
+    uint8_t *buff = NULL;
-        //do not write 3bytes int node
+    //do not write 3bytes int node
-        if (size == 3)
+    if (size == 3)
-                size++;
+        size++;
-        buff = (uint8_t *) malloc(sizeof(uint8_t) + size);
+    buff = (uint8_t *) malloc(sizeof(uint8_t) + size);
-        buff[0] = BPLIST_UINT | Log2(size);
+    buff[0] = BPLIST_UINT | Log2(size);
-        memcpy(buff + 1, &val, size);
+    memcpy(buff + 1, &val, size);
-        byte_convert(buff + 1, size);
+    byte_convert(buff + 1, size);
-        g_byte_array_append(bplist, buff, sizeof(uint8_t) + size);
+    g_byte_array_append(bplist, buff, sizeof(uint8_t) + size);
-        free(buff);
+    free(buff);
 }
 static void write_real(GByteArray * bplist, double val)
 {
-        uint64_t size = get_real_bytes(*((uint64_t *) & val));  //cheat to know used space
+    uint64_t size = get_real_bytes(*((uint64_t *) & val));      //cheat to know used space
-        uint8_t *buff = (uint8_t *) malloc(sizeof(uint8_t) + size);
+    uint8_t *buff = (uint8_t *) malloc(sizeof(uint8_t) + size);
-        buff[0] = BPLIST_REAL | Log2(size);
+    buff[0] = BPLIST_REAL | Log2(size);
-        if (size == sizeof(double)) {
+    if (size == sizeof(double))
-                memcpy(buff + 1, &val, size);
+    {
-        } else if (size == sizeof(float)) {
+        memcpy(buff + 1, &val, size);
-                float tmpval = (float) val;
+    }
-                memcpy(buff + 1, &tmpval, size);
+    else if (size == sizeof(float))
-        }
+    {
-        byte_convert(buff + 1, size);
+        float tmpval = (float) val;
-        g_byte_array_append(bplist, buff, sizeof(uint8_t) + size);
+        memcpy(buff + 1, &tmpval, size);
-        free(buff);
+    }
+    byte_convert(buff + 1, size);
+    g_byte_array_append(bplist, buff, sizeof(uint8_t) + size);
+    free(buff);
 }
 static void write_date(GByteArray * bplist, double val)
 {
-        uint64_t size = 8;                      //dates always use 8 bytes
+    uint64_t size = 8;                  //dates always use 8 bytes
-        uint8_t *buff = (uint8_t *) malloc(sizeof(uint8_t) + size);
+    uint8_t *buff = (uint8_t *) malloc(sizeof(uint8_t) + size);
-        buff[0] = BPLIST_DATE | Log2(size);
+    buff[0] = BPLIST_DATE | Log2(size);
-        memcpy(buff + 1, &val, size);
+    memcpy(buff + 1, &val, size);
-        byte_convert(buff + 1, size);
+    byte_convert(buff + 1, size);
-        g_byte_array_append(bplist, buff, sizeof(uint8_t) + size);
+    g_byte_array_append(bplist, buff, sizeof(uint8_t) + size);
-        free(buff);
+    free(buff);
 }
 static void write_raw_data(GByteArray * bplist, uint8_t mark, uint8_t * val, uint64_t size)
 {
-        uint8_t *buff = NULL;
+    uint8_t *buff = NULL;
-        uint8_t marker = mark | (size < 15 ? size : 0xf);
+    uint8_t marker = mark | (size < 15 ? size : 0xf);
-        g_byte_array_append(bplist, &marker, sizeof(uint8_t));
+    g_byte_array_append(bplist, &marker, sizeof(uint8_t));
-        if (size >= 15) {
+    if (size >= 15)
-                GByteArray *int_buff = g_byte_array_new();
+    {
-                write_int(int_buff, size);
+        GByteArray *int_buff = g_byte_array_new();
-                g_byte_array_append(bplist, int_buff->data, int_buff->len);
+        write_int(int_buff, size);
-                g_byte_array_free(int_buff, TRUE);
+        g_byte_array_append(bplist, int_buff->data, int_buff->len);
-        }
+        g_byte_array_free(int_buff, TRUE);
-        buff = (uint8_t *) malloc(size);
+    }
-        memcpy(buff, val, size);
+    buff = (uint8_t *) malloc(size);
-        g_byte_array_append(bplist, buff, size);
+    memcpy(buff, val, size);
-        free(buff);
+    g_byte_array_append(bplist, buff, size);
+    free(buff);
 }
 static void write_data(GByteArray * bplist, uint8_t * val, uint64_t size)
 {
-        write_raw_data(bplist, BPLIST_DATA, val, size);
+    write_raw_data(bplist, BPLIST_DATA, val, size);
 }
 static void write_string(GByteArray * bplist, char *val)
 {
-        uint64_t size = strlen(val);
+    uint64_t size = strlen(val);
-        write_raw_data(bplist, BPLIST_STRING, (uint8_t *) val, size);
+    write_raw_data(bplist, BPLIST_STRING, (uint8_t *) val, size);
 }
 static void write_unicode(GByteArray * bplist, gunichar2 * val, uint64_t size)
 {
-        uint64_t i = 0;
+    uint64_t i = 0;
-        uint64_t size2 = size * sizeof(gunichar2);
+    uint64_t size2 = size * sizeof(gunichar2);
-        uint8_t *buff = (uint8_t *) malloc(size2);
+    uint8_t *buff = (uint8_t *) malloc(size2);
-        memcpy(buff, val, size2);
+    memcpy(buff, val, size2);
-        for (i = 0; i < size; i++)
+    for (i = 0; i < size; i++)
-                byte_convert(buff + i * sizeof(gunichar2), sizeof(gunichar2));
+        byte_convert(buff + i * sizeof(gunichar2), sizeof(gunichar2));
-        write_raw_data(bplist, BPLIST_STRING, buff, size2);
+    write_raw_data(bplist, BPLIST_STRING, buff, size2);
 }
 static void write_array(GByteArray * bplist, GNode * node, GHashTable * ref_table, uint8_t dict_param_size)
 {
-        uint64_t idx = 0;
+    uint64_t idx = 0;
-        uint8_t *buff = NULL;
+    uint8_t *buff = NULL;
-        GNode *cur = NULL;
+    GNode *cur = NULL;
-        uint64_t i = 0;
+    uint64_t i = 0;
-        uint64_t size = g_node_n_children(node);
+    uint64_t size = g_node_n_children(node);
-        uint8_t marker = BPLIST_ARRAY | (size < 15 ? size : 0xf);
+    uint8_t marker = BPLIST_ARRAY | (size < 15 ? size : 0xf);
-        g_byte_array_append(bplist, &marker, sizeof(uint8_t));
+    g_byte_array_append(bplist, &marker, sizeof(uint8_t));
-        if (size >= 15) {
+    if (size >= 15)
-                GByteArray *int_buff = g_byte_array_new();
+    {
-                write_int(int_buff, size);
+        GByteArray *int_buff = g_byte_array_new();
-                g_byte_array_append(bplist, int_buff->data, int_buff->len);
+        write_int(int_buff, size);
-                g_byte_array_free(int_buff, TRUE);
+        g_byte_array_append(bplist, int_buff->data, int_buff->len);
-        }
+        g_byte_array_free(int_buff, TRUE);
+    }
-        buff = (uint8_t *) malloc(size * dict_param_size);
+    buff = (uint8_t *) malloc(size * dict_param_size);
-        for (i = 0, cur = node->children; cur && i < size; cur = cur->next, i++) {
-                idx = *(uint64_t *) (g_hash_table_lookup(ref_table, cur));
+    for (i = 0, cur = node->children; cur && i < size; cur = cur->next, i++)
-                memcpy(buff + i * dict_param_size, &idx, dict_param_size);
+    {
-                byte_convert(buff + i * dict_param_size, dict_param_size);
+        idx = *(uint64_t *) (g_hash_table_lookup(ref_table, cur));
-        }
+        memcpy(buff + i * dict_param_size, &idx, dict_param_size);
+        byte_convert(buff + i * dict_param_size, dict_param_size);
-        //now append to bplist
+    }
-        g_byte_array_append(bplist, buff, size * dict_param_size);
-        free(buff);
+    //now append to bplist
+    g_byte_array_append(bplist, buff, size * dict_param_size);
+    free(buff);
 }
 static void write_dict(GByteArray * bplist, GNode * node, GHashTable * ref_table, uint8_t dict_param_size)
 {
-        uint64_t idx1 = 0;
+    uint64_t idx1 = 0;
-        uint64_t idx2 = 0;
+    uint64_t idx2 = 0;
-        uint8_t *buff = NULL;
+    uint8_t *buff = NULL;
-        GNode *cur = NULL;
+    GNode *cur = NULL;
-        uint64_t i = 0;
+    uint64_t i = 0;
-        uint64_t size = g_node_n_children(node) / 2;
+    uint64_t size = g_node_n_children(node) / 2;
-        uint8_t marker = BPLIST_DICT | (size < 15 ? size : 0xf);
+    uint8_t marker = BPLIST_DICT | (size < 15 ? size : 0xf);
-        g_byte_array_append(bplist, &marker, sizeof(uint8_t));
+    g_byte_array_append(bplist, &marker, sizeof(uint8_t));
-        if (size >= 15) {
+    if (size >= 15)
-                GByteArray *int_buff = g_byte_array_new();
+    {
-                write_int(int_buff, size);
+        GByteArray *int_buff = g_byte_array_new();
-                g_byte_array_append(bplist, int_buff->data, int_buff->len);
+        write_int(int_buff, size);
-                g_byte_array_free(int_buff, TRUE);
+        g_byte_array_append(bplist, int_buff->data, int_buff->len);
-        }
+        g_byte_array_free(int_buff, TRUE);
+    }
-        buff = (uint8_t *) malloc(size * 2 * dict_param_size);
+    buff = (uint8_t *) malloc(size * 2 * dict_param_size);
-        for (i = 0, cur = node->children; cur && i < size; cur = cur->next->next, i++) {
-                idx1 = *(uint64_t *) (g_hash_table_lookup(ref_table, cur));
+    for (i = 0, cur = node->children; cur && i < size; cur = cur->next->next, i++)
-                memcpy(buff + i * dict_param_size, &idx1, dict_param_size);
+    {
-                byte_convert(buff + i * dict_param_size, dict_param_size);
+        idx1 = *(uint64_t *) (g_hash_table_lookup(ref_table, cur));
+        memcpy(buff + i * dict_param_size, &idx1, dict_param_size);
-                idx2 = *(uint64_t *) (g_hash_table_lookup(ref_table, cur->next));
+        byte_convert(buff + i * dict_param_size, dict_param_size);
-                memcpy(buff + (i + size) * dict_param_size, &idx2, dict_param_size);
-                byte_convert(buff + (i + size) * dict_param_size, dict_param_size);
+        idx2 = *(uint64_t *) (g_hash_table_lookup(ref_table, cur->next));
-        }
+        memcpy(buff + (i + size) * dict_param_size, &idx2, dict_param_size);
+        byte_convert(buff + (i + size) * dict_param_size, dict_param_size);
-        //now append to bplist
+    }
-        g_byte_array_append(bplist, buff, size * 2 * dict_param_size);
-        free(buff);
+    //now append to bplist
+    g_byte_array_append(bplist, buff, size * 2 * dict_param_size);
+    free(buff);
 }
 void plist_to_bin(plist_t plist, char **plist_bin, uint32_t * length)
 {
-        GPtrArray *objects = NULL;
+    GPtrArray *objects = NULL;
-        GHashTable *ref_table = NULL;
+    GHashTable *ref_table = NULL;
-        struct serialize_s ser_s;
+    struct serialize_s ser_s;
-        uint8_t offset_size = 0;
+    uint8_t offset_size = 0;
-        uint8_t dict_param_size = 0;
+    uint8_t dict_param_size = 0;
-        uint64_t num_objects = 0;
+    uint64_t num_objects = 0;
-        uint64_t root_object = 0;
+    uint64_t root_object = 0;
-        uint64_t offset_table_index = 0;
+    uint64_t offset_table_index = 0;
-        GByteArray *bplist_buff = NULL;
+    GByteArray *bplist_buff = NULL;
-        uint64_t i = 0;
+    uint64_t i = 0;
-        uint8_t *buff = NULL;
+    uint8_t *buff = NULL;
-        uint64_t *offsets = NULL;
+    uint64_t *offsets = NULL;
-        uint8_t pad[6] = { 0, 0, 0, 0, 0, 0 };
+    uint8_t pad[6] = { 0, 0, 0, 0, 0, 0 };
-        uint8_t trailer[BPLIST_TRL_SIZE];
+    uint8_t trailer[BPLIST_TRL_SIZE];
-        //for string
+    //for string
-        glong len = 0;
+    glong len = 0;
-        int type = 0;
+    int type = 0;
-        glong items_read = 0;
+    glong items_read = 0;
-        glong items_written = 0;
+    glong items_written = 0;
-        GError *error = NULL;
+    GError *error = NULL;
-        gunichar2 *unicodestr = NULL;
+    gunichar2 *unicodestr = NULL;
-        //check for valid input
+    //check for valid input
-        if (!plist || !plist_bin || *plist_bin || !length)
+    if (!plist || !plist_bin || *plist_bin || !length)
-                return;
+        return;
-        //list of objects
+    //list of objects
-        objects = g_ptr_array_new();
+    objects = g_ptr_array_new();
-        //hashtable to write only once same nodes
+    //hashtable to write only once same nodes
-        ref_table = g_hash_table_new(plist_data_hash, plist_data_compare);
+    ref_table = g_hash_table_new(plist_data_hash, plist_data_compare);
-        //serialize plist
+    //serialize plist
-        ser_s.objects = objects;
+    ser_s.objects = objects;
-        ser_s.ref_table = ref_table;
+    ser_s.ref_table = ref_table;
-        serialize_plist(plist, &ser_s);
+    serialize_plist(plist, &ser_s);
-        //now stream to output buffer
+    //now stream to output buffer
-        offset_size = 0;                        //unknown yet
+    offset_size = 0;                    //unknown yet
-        dict_param_size = get_needed_bytes(objects->len);
+    dict_param_size = get_needed_bytes(objects->len);
-        num_objects = objects->len;
+    num_objects = objects->len;
-        root_object = 0;                        //root is first in list
+    root_object = 0;                    //root is first in list
-        offset_table_index = 0;         //unknown yet
+    offset_table_index = 0;             //unknown yet
-        //setup a dynamic bytes array to store bplist in
+    //setup a dynamic bytes array to store bplist in
-        bplist_buff = g_byte_array_new();
+    bplist_buff = g_byte_array_new();
-        //set magic number and version
+    //set magic number and version
-        g_byte_array_append(bplist_buff, BPLIST_MAGIC, BPLIST_MAGIC_SIZE);
+    g_byte_array_append(bplist_buff, BPLIST_MAGIC, BPLIST_MAGIC_SIZE);
-        g_byte_array_append(bplist_buff, BPLIST_VERSION, BPLIST_VERSION_SIZE);
+    g_byte_array_append(bplist_buff, BPLIST_VERSION, BPLIST_VERSION_SIZE);
-        //write objects and table
+    //write objects and table
-        offsets = (uint64_t *) malloc(num_objects * sizeof(uint64_t));
+    offsets = (uint64_t *) malloc(num_objects * sizeof(uint64_t));
-        for (i = 0; i < num_objects; i++) {
+    for (i = 0; i < num_objects; i++)
+    {
-                plist_data_t data = plist_get_data(g_ptr_array_index(objects, i));
-                offsets[i] = bplist_buff->len;
+        plist_data_t data = plist_get_data(g_ptr_array_index(objects, i));
+        offsets[i] = bplist_buff->len;
-                switch (data->type) {
-                case PLIST_BOOLEAN:
+        switch (data->type)
-                        buff = (uint8_t *) malloc(sizeof(uint8_t));
+        {
-                        buff[0] = data->boolval ? BPLIST_TRUE : BPLIST_FALSE;
+        case PLIST_BOOLEAN:
-                        g_byte_array_append(bplist_buff, buff, sizeof(uint8_t));
+            buff = (uint8_t *) malloc(sizeof(uint8_t));
-                        free(buff);
+            buff[0] = data->boolval ? BPLIST_TRUE : BPLIST_FALSE;
-                        break;
+            g_byte_array_append(bplist_buff, buff, sizeof(uint8_t));
+            free(buff);
-                case PLIST_UINT:
+            break;
-                        write_int(bplist_buff, data->intval);
-                        break;
+        case PLIST_UINT:
+            write_int(bplist_buff, data->intval);
-                case PLIST_REAL:
+            break;
-                        write_real(bplist_buff, data->realval);
-                        break;
+        case PLIST_REAL:
+            write_real(bplist_buff, data->realval);
-                case PLIST_KEY:
+            break;
-                case PLIST_STRING:
-                        len = strlen(data->strval);
+        case PLIST_KEY:
-                        type = xmlDetectCharEncoding(data->strval, len);
+        case PLIST_STRING:
-                        if (XML_CHAR_ENCODING_UTF8 == type) {
+            len = strlen(data->strval);
-                                unicodestr = g_utf8_to_utf16(data->strval, len, &items_read, &items_written, &error);
+            type = xmlDetectCharEncoding(data->strval, len);
-                                write_unicode(bplist_buff, unicodestr, items_written);
+            if (XML_CHAR_ENCODING_UTF8 == type)
-                                g_free(unicodestr);
+            {
-                        } else if (XML_CHAR_ENCODING_ASCII == type || XML_CHAR_ENCODING_NONE == type) {
+                unicodestr = g_utf8_to_utf16(data->strval, len, &items_read, &items_written, &error);
-                                write_string(bplist_buff, data->strval);
+                write_unicode(bplist_buff, unicodestr, items_written);
-                        }
+                g_free(unicodestr);
-                        break;
+            }
-                case PLIST_DATA:
+            else if (XML_CHAR_ENCODING_ASCII == type || XML_CHAR_ENCODING_NONE == type)
-                        write_data(bplist_buff, data->buff, data->length);
+            {
-                case PLIST_ARRAY:
+                write_string(bplist_buff, data->strval);
-                        write_array(bplist_buff, g_ptr_array_index(objects, i), ref_table, dict_param_size);
+            }
-                        break;
+            break;
-                case PLIST_DICT:
+        case PLIST_DATA:
-                        write_dict(bplist_buff, g_ptr_array_index(objects, i), ref_table, dict_param_size);
+            write_data(bplist_buff, data->buff, data->length);
-                        break;
+        case PLIST_ARRAY:
-                case PLIST_DATE:
+            write_array(bplist_buff, g_ptr_array_index(objects, i), ref_table, dict_param_size);
-                        write_date(bplist_buff, data->timeval.tv_sec + (double) data->timeval.tv_usec / G_USEC_PER_SEC);
+            break;
-                        break;
+        case PLIST_DICT:
-                default:
+            write_dict(bplist_buff, g_ptr_array_index(objects, i), ref_table, dict_param_size);
-                        break;
+            break;
-                }
+        case PLIST_DATE:
-        }
+            write_date(bplist_buff, data->timeval.tv_sec + (double) data->timeval.tv_usec / G_USEC_PER_SEC);
+            break;
-        //free intermediate objects
+        default:
-        g_hash_table_foreach_remove(ref_table, free_index, NULL);
+            break;
-        g_ptr_array_free(objects, TRUE);
+        }
-        g_hash_table_destroy(ref_table);
+    }
-        //write offsets
+    //free intermediate objects
-        offset_size = get_needed_bytes(bplist_buff->len);
+    g_hash_table_foreach_remove(ref_table, free_index, NULL);
-        offset_table_index = bplist_buff->len;
+    g_ptr_array_free(objects, TRUE);
-        for (i = 0; i < num_objects; i++) {
+    g_hash_table_destroy(ref_table);
-                uint8_t *offsetbuff = (uint8_t *) malloc(offset_size);
-                memcpy(offsetbuff, offsets + i, offset_size);
+    //write offsets
-                byte_convert(offsetbuff, offset_size);
+    offset_size = get_needed_bytes(bplist_buff->len);
-                g_byte_array_append(bplist_buff, offsetbuff, offset_size);
+    offset_table_index = bplist_buff->len;
-                free(offsetbuff);
+    for (i = 0; i < num_objects; i++)
-        }
+    {
+        uint8_t *offsetbuff = (uint8_t *) malloc(offset_size);
-        //experimental pad to reflect apple's files
+        memcpy(offsetbuff, offsets + i, offset_size);
-        g_byte_array_append(bplist_buff, pad, 6);
+        byte_convert(offsetbuff, offset_size);
+        g_byte_array_append(bplist_buff, offsetbuff, offset_size);
-        //setup trailer
+        free(offsetbuff);
-        num_objects = GUINT64_FROM_BE(num_objects);
+    }
-        root_object = GUINT64_FROM_BE(root_object);
-        offset_table_index = GUINT64_FROM_BE(offset_table_index);
+    //experimental pad to reflect apple's files
+    g_byte_array_append(bplist_buff, pad, 6);
-        memcpy(trailer + BPLIST_TRL_OFFSIZE_IDX, &offset_size, sizeof(uint8_t));
-        memcpy(trailer + BPLIST_TRL_PARMSIZE_IDX, &dict_param_size, sizeof(uint8_t));
+    //setup trailer
-        memcpy(trailer + BPLIST_TRL_NUMOBJ_IDX, &num_objects, sizeof(uint64_t));
+    num_objects = GUINT64_FROM_BE(num_objects);
-        memcpy(trailer + BPLIST_TRL_ROOTOBJ_IDX, &root_object, sizeof(uint64_t));
+    root_object = GUINT64_FROM_BE(root_object);
-        memcpy(trailer + BPLIST_TRL_OFFTAB_IDX, &offset_table_index, sizeof(uint64_t));
+    offset_table_index = GUINT64_FROM_BE(offset_table_index);
-        g_byte_array_append(bplist_buff, trailer, BPLIST_TRL_SIZE);
+    memcpy(trailer + BPLIST_TRL_OFFSIZE_IDX, &offset_size, sizeof(uint8_t));
+    memcpy(trailer + BPLIST_TRL_PARMSIZE_IDX, &dict_param_size, sizeof(uint8_t));
-        //duplicate buffer
+    memcpy(trailer + BPLIST_TRL_NUMOBJ_IDX, &num_objects, sizeof(uint64_t));
-        *plist_bin = (char *) malloc(bplist_buff->len);
+    memcpy(trailer + BPLIST_TRL_ROOTOBJ_IDX, &root_object, sizeof(uint64_t));
-        memcpy(*plist_bin, bplist_buff->data, bplist_buff->len);
+    memcpy(trailer + BPLIST_TRL_OFFTAB_IDX, &offset_table_index, sizeof(uint64_t));
-        *length = bplist_buff->len;
+    g_byte_array_append(bplist_buff, trailer, BPLIST_TRL_SIZE);
-        g_byte_array_free(bplist_buff, TRUE);
-        free(offsets);
+    //duplicate buffer
+    *plist_bin = (char *) malloc(bplist_buff->len);
+    memcpy(*plist_bin, bplist_buff->data, bplist_buff->len);
+    *length = bplist_buff->len;
+    g_byte_array_free(bplist_buff, TRUE);
+    free(offsets);
 }
diff --git a/src/plist.c b/src/plist.c
index 30be007..9628e38 100644
--- a/src/plist.c
+++ b/src/plist.c
@@ -28,719 +28,762 @@
 plist_t plist_new_node(plist_data_t data)
 {
-        return (plist_t) g_node_new(data);
+    return (plist_t) g_node_new(data);
 }
 plist_data_t plist_get_data(const plist_t node)
 {
-        if (!node)
+    if (!node)
-                return NULL;
+        return NULL;
-        return ((GNode *) node)->data;
+    return ((GNode *) node)->data;
 }
 plist_data_t plist_new_plist_data(void)
 {
-        plist_data_t data = (plist_data_t) calloc(sizeof(struct plist_data_s), 1);
+    plist_data_t data = (plist_data_t) calloc(sizeof(struct plist_data_s), 1);
-        return data;
+    return data;
 }
 static void plist_free_data(plist_data_t data)
 {
-        if (data) {
+    if (data)
-                switch (data->type) {
+    {
-                case PLIST_KEY:
+        switch (data->type)
-                case PLIST_STRING:
+        {
-                        free(data->strval);
+        case PLIST_KEY:
-                        break;
+        case PLIST_STRING:
-                case PLIST_DATA:
+            free(data->strval);
-                        free(data->buff);
+            break;
-                        break;
+        case PLIST_DATA:
-                default:
+            free(data->buff);
-                        break;
+            break;
-                }
+        default:
-                free(data);
+            break;
-        }
+        }
+        free(data);
+    }
 }
 static void plist_free_node(GNode * node, gpointer none)
 {
    plist_data_t data = NULL;
-        g_node_unlink(node);
+    g_node_unlink(node);
-        data = plist_get_data(node);
+    data = plist_get_data(node);
-        plist_free_data(data);
+    plist_free_data(data);
-        node->data = NULL;
+    node->data = NULL;
-        g_node_children_foreach(node, G_TRAVERSE_ALL, plist_free_node, NULL);
+    g_node_children_foreach(node, G_TRAVERSE_ALL, plist_free_node, NULL);
 }
 plist_t plist_new_dict(void)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_DICT;
+    data->type = PLIST_DICT;
-        return plist_new_node(data);
+    return plist_new_node(data);
 }
 plist_t plist_new_array(void)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_ARRAY;
+    data->type = PLIST_ARRAY;
-        return plist_new_node(data);
+    return plist_new_node(data);
 }
 //These nodes should not be handled by users
 static plist_t plist_new_key(const char *val)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_KEY;
+    data->type = PLIST_KEY;
-        data->strval = strdup(val);
+    data->strval = strdup(val);
-        data->length = strlen(val);
+    data->length = strlen(val);
-        return plist_new_node(data);
+    return plist_new_node(data);
 }
 plist_t plist_new_string(const char *val)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_STRING;
+    data->type = PLIST_STRING;
-        data->strval = strdup(val);
+    data->strval = strdup(val);
-        data->length = strlen(val);
+    data->length = strlen(val);
-        return plist_new_node(data);
+    return plist_new_node(data);
 }
 plist_t plist_new_bool(uint8_t val)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_BOOLEAN;
+    data->type = PLIST_BOOLEAN;
-        data->boolval = val;
+    data->boolval = val;
-        data->length = sizeof(uint8_t);
+    data->length = sizeof(uint8_t);
-        return plist_new_node(data);
+    return plist_new_node(data);
 }
 plist_t plist_new_uint(uint64_t val)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_UINT;
+    data->type = PLIST_UINT;
-        data->intval = val;
+    data->intval = val;
-        data->length = sizeof(uint64_t);
+    data->length = sizeof(uint64_t);
-        return plist_new_node(data);
+    return plist_new_node(data);
 }
 plist_t plist_new_real(double val)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_REAL;
+    data->type = PLIST_REAL;
-        data->realval = val;
+    data->realval = val;
-        data->length = sizeof(double);
+    data->length = sizeof(double);
-        return plist_new_node(data);
+    return plist_new_node(data);
 }
 plist_t plist_new_data(const char *val, uint64_t length)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_DATA;
+    data->type = PLIST_DATA;
-        data->buff = (uint8_t *) malloc(length);
+    data->buff = (uint8_t *) malloc(length);
-        memcpy(data->buff, val, length);
+    memcpy(data->buff, val, length);
-        data->length = length;
+    data->length = length;
-        return plist_new_node(data);
+    return plist_new_node(data);
 }
 plist_t plist_new_date(int32_t sec, int32_t usec)
 {
-        plist_data_t data = plist_new_plist_data();
+    plist_data_t data = plist_new_plist_data();
-        data->type = PLIST_DATE;
+    data->type = PLIST_DATE;
-        data->timeval.tv_sec = sec;
+    data->timeval.tv_sec = sec;
-        data->timeval.tv_usec = usec;
+    data->timeval.tv_usec = usec;
-        data->length = sizeof(GTimeVal);
+    data->length = sizeof(GTimeVal);
-        return plist_new_node(data);
+    return plist_new_node(data);
 }
 void plist_free(plist_t plist)
 {
-        if (plist) {
+    if (plist)
-                plist_free_node(plist, NULL);
+    {
-                g_node_destroy(plist);
+        plist_free_node(plist, NULL);
-        }
+        g_node_destroy(plist);
+    }
 }
 static void plist_copy_node(GNode * node, gpointer parent_node_ptr)
 {
    plist_type node_type = PLIST_NONE;
-        plist_t newnode = NULL;
+    plist_t newnode = NULL;
-        plist_data_t data = plist_get_data(node);
+    plist_data_t data = plist_get_data(node);
-        plist_data_t newdata = plist_new_plist_data();
+    plist_data_t newdata = plist_new_plist_data();
-        assert(data);                           // plist should always have data
+    assert(data);                               // plist should always have data
-        memcpy(newdata, data, sizeof(struct plist_data_s));
+    memcpy(newdata, data, sizeof(struct plist_data_s));
-        node_type = plist_get_node_type(node);
+    node_type = plist_get_node_type(node);
-        if (node_type == PLIST_DATA || node_type == PLIST_STRING || node_type == PLIST_KEY) {
+    if (node_type == PLIST_DATA || node_type == PLIST_STRING || node_type == PLIST_KEY)
-                switch (node_type) {
+    {
-                case PLIST_DATA:
+        switch (node_type)
-                        newdata->buff = (uint8_t *) malloc(data->length);
+        {
-                        memcpy(newdata->buff, data->buff, data->length);
+        case PLIST_DATA:
-                case PLIST_KEY:
+            newdata->buff = (uint8_t *) malloc(data->length);
-                case PLIST_STRING:
+            memcpy(newdata->buff, data->buff, data->length);
-                        newdata->strval = strdup((char *) data->strval);
+        case PLIST_KEY:
-                default:
+        case PLIST_STRING:
-                        break;
+            newdata->strval = strdup((char *) data->strval);
-                }
+        default:
-        }
+            break;
-        newnode = plist_new_node(newdata);
+        }
+    }
-        if (*(plist_t*)parent_node_ptr) {
+    newnode = plist_new_node(newdata);
-                g_node_append(*(plist_t*)parent_node_ptr, newnode);
-        }
+    if (*(plist_t*)parent_node_ptr)
-        else {
+    {
-                *(plist_t*)parent_node_ptr = newnode;
+        g_node_append(*(plist_t*)parent_node_ptr, newnode);
-        }
+    }
+    else
-        g_node_children_foreach(node, G_TRAVERSE_ALL, plist_copy_node, &newnode);
+    {
+        *(plist_t*)parent_node_ptr = newnode;
+    }
+    g_node_children_foreach(node, G_TRAVERSE_ALL, plist_copy_node, &newnode);
 }
 plist_t plist_copy(plist_t node)
 {
-        plist_t copied = NULL;
+    plist_t copied = NULL;
-        plist_copy_node(node, &copied);
+    plist_copy_node(node, &copied);
-        return copied;
+    return copied;
 }
 uint32_t plist_array_get_size(plist_t node)
 {
-        uint32_t ret = 0;
+    uint32_t ret = 0;
-        if (node && PLIST_ARRAY == plist_get_node_type(node)) {
+    if (node && PLIST_ARRAY == plist_get_node_type(node))
-                ret = g_node_n_children(node);
+    {
-        }
+        ret = g_node_n_children(node);
-        return ret;
+    }
+    return ret;
 }
 plist_t plist_array_get_item(plist_t node, uint32_t n)
 {
-        plist_t ret = NULL;
+    plist_t ret = NULL;
-        if (node && PLIST_ARRAY == plist_get_node_type(node)) {
+    if (node && PLIST_ARRAY == plist_get_node_type(node))
-                ret = (plist_t)g_node_nth_child(node, n);
+    {
-        }
+        ret = (plist_t)g_node_nth_child(node, n);
-        return ret;
+    }
+    return ret;
 }
 uint32_t plist_array_get_item_index(plist_t node)
 {
-        plist_t father = plist_get_parent(node);
+    plist_t father = plist_get_parent(node);
-        if (PLIST_ARRAY == plist_get_node_type(father)) {
+    if (PLIST_ARRAY == plist_get_node_type(father))
-                return g_node_child_position(father, node);
+    {
-        }
+        return g_node_child_position(father, node);
+    }
    return 0;
 }
 void plist_array_set_item(plist_t node, plist_t item, uint32_t n)
 {
-        if (node && PLIST_ARRAY == plist_get_node_type(node)) {
+    if (node && PLIST_ARRAY == plist_get_node_type(node))
-                plist_t old_item = plist_array_get_item(node, n);
+    {
-                if (old_item) {
+        plist_t old_item = plist_array_get_item(node, n);
-                        plist_free_node(old_item, NULL);
+        if (old_item)
-                        old_item = NULL;
+        {
-                        plist_copy_node(item, &old_item);
+            plist_free_node(old_item, NULL);
-                }
+            old_item = NULL;
-        }
+            plist_copy_node(item, &old_item);
-        return;
+        }
+    }
+    return;
 }
 void plist_array_append_item(plist_t node, plist_t item)
 {
-        if (node && PLIST_ARRAY == plist_get_node_type(node)) {
+    if (node && PLIST_ARRAY == plist_get_node_type(node))
-                g_node_append(node, item);
+    {
-        }
+        g_node_append(node, item);
-        return;
+    }
+    return;
 }
 void plist_array_insert_item(plist_t node, plist_t item, uint32_t n)
 {
-        if (node && PLIST_ARRAY == plist_get_node_type(node)) {
+    if (node && PLIST_ARRAY == plist_get_node_type(node))
-                g_node_insert(node, n, item);
+    {
-        }
+        g_node_insert(node, n, item);
-        return;
+    }
+    return;
 }
 void plist_array_remove_item(plist_t node, uint32_t n)
 {
-        if (node && PLIST_ARRAY == plist_get_node_type(node)) {
+    if (node && PLIST_ARRAY == plist_get_node_type(node))
-                plist_t old_item = plist_array_get_item(node, n);
+    {
-                if (old_item) {
+        plist_t old_item = plist_array_get_item(node, n);
-                        plist_free(old_item);
+        if (old_item)
-                }
+        {
-        }
+            plist_free(old_item);
-        return;
+        }
+    }
+    return;
 }
 uint32_t plist_dict_get_size(plist_t node)
 {
-        uint32_t ret = 0;
+    uint32_t ret = 0;
-        if (node && PLIST_DICT == plist_get_node_type(node)) {
+    if (node && PLIST_DICT == plist_get_node_type(node))
-                ret = g_node_n_children(node) / 2;
+    {
-        }
+        ret = g_node_n_children(node) / 2;
-        return ret;
+    }
+    return ret;
 }
 void plist_dict_new_iter(plist_t node, plist_dict_iter *iter)
 {
-        if (iter && *iter == NULL) {
+    if (iter && *iter == NULL)
-                *iter = malloc(sizeof(uint32_t));
+    {
-                *((uint32_t*)(*iter)) = 0;
+        *iter = malloc(sizeof(uint32_t));
-        }
+        *((uint32_t*)(*iter)) = 0;
-        return;
+    }
+    return;
 }
 void plist_dict_next_item(plist_t node, plist_dict_iter iter, char **key, plist_t *val)
 {
-        uint32_t* iter_int = (uint32_t*) iter;
+    uint32_t* iter_int = (uint32_t*) iter;
-        if (key) {
+    if (key)
-                *key = NULL;
+    {
-        }
+        *key = NULL;
-        if (val) {
+    }
-                *val = NULL;
+    if (val)
-        }
+    {
+        *val = NULL;
+    }
-        if (node && PLIST_DICT == plist_get_node_type(node) && *iter_int < g_node_n_children(node)) {
+    if (node && PLIST_DICT == plist_get_node_type(node) && *iter_int < g_node_n_children(node))
+    {
-                if (key) {
+        if (key)
-                        plist_get_key_val((plist_t)g_node_nth_child(node, *iter_int), key);
+        {
-                }
+            plist_get_key_val((plist_t)g_node_nth_child(node, *iter_int), key);
+        }
-                if (val) {
+        if (val)
-                        *val = (plist_t) g_node_nth_child(node, *iter_int + 1);
+        {
-                }
+            *val = (plist_t) g_node_nth_child(node, *iter_int + 1);
+        }
-                *iter_int += 2;
+        *iter_int += 2;
-        }
+    }
-        return;
+    return;
 }
 void plist_dict_get_item_key(plist_t node, char **key)
 {
-        plist_t father = plist_get_parent(node);
+    plist_t father = plist_get_parent(node);
-        if (PLIST_DICT == plist_get_node_type(father)) {
+    if (PLIST_DICT == plist_get_node_type(father))
-                plist_get_key_val( (plist_t) g_node_prev_sibling(node), key);
+    {
-        }
+        plist_get_key_val( (plist_t) g_node_prev_sibling(node), key);
+    }
 }
 plist_t plist_dict_get_item(plist_t node, const char* key)
 {
-        plist_t ret = NULL;
+    plist_t ret = NULL;
-        if (node && PLIST_DICT == plist_get_node_type(node)) {
+    if (node && PLIST_DICT == plist_get_node_type(node))
+    {
-                plist_t current = NULL;
+        plist_t current = NULL;
-                for (current = (plist_t)g_node_first_child(node);
+        for (current = (plist_t)g_node_first_child(node);
-                        current;
+                current;
-                        current = (plist_t)g_node_next_sibling(g_node_next_sibling(current))) {
+                current = (plist_t)g_node_next_sibling(g_node_next_sibling(current)))
+        {
-                        plist_data_t data = plist_get_data(current);
+            plist_data_t data = plist_get_data(current);
            assert( PLIST_KEY == plist_get_node_type(current) );
-                        if (data && !strcmp(key, data->strval)) {
+            if (data && !strcmp(key, data->strval))
-                                ret = (plist_t)g_node_next_sibling(current);
+            {
-                                break;
+                ret = (plist_t)g_node_next_sibling(current);
-                        }
+                break;
-                }
+            }
-        }
+        }
-        return ret;
+    }
+    return ret;
 }
 void plist_dict_set_item(plist_t node, const char* key, plist_t item)
 {
-        if (node && PLIST_DICT == plist_get_node_type(node)) {
+    if (node && PLIST_DICT == plist_get_node_type(node))
-                plist_t old_item = plist_dict_get_item(node, key);
+    {
-                if (old_item) {
+        plist_t old_item = plist_dict_get_item(node, key);
-                        plist_free_node(old_item, NULL);
+        if (old_item)
-                        old_item = NULL;
+        {
-                        plist_copy_node(item, &old_item);
+            plist_free_node(old_item, NULL);
-                }
+            old_item = NULL;
-        }
+            plist_copy_node(item, &old_item);
-        return;
+        }
+    }
+    return;
 }
 void plist_dict_insert_item(plist_t node, const char* key, plist_t item)
 {
-        if (node && PLIST_DICT == plist_get_node_type(node)) {
+    if (node && PLIST_DICT == plist_get_node_type(node))
-                g_node_append(node, plist_new_key(key));
+    {
-                g_node_append(node, item);
+        g_node_append(node, plist_new_key(key));
-        }
+        g_node_append(node, item);
-        return;
+    }
+    return;
 }
 void plist_dict_remove_item(plist_t node, const char* key)
 {
-        if (node && PLIST_DICT == plist_get_node_type(node)) {
+    if (node && PLIST_DICT == plist_get_node_type(node))
-                plist_t old_item = plist_dict_get_item(node, key);
+    {
-                if (old_item) {
+        plist_t old_item = plist_dict_get_item(node, key);
-                        plist_t key_node = g_node_prev_sibling(old_item);
+        if (old_item)
-                        plist_free(key_node);
+        {
-                        plist_free(old_item);
+            plist_t key_node = g_node_prev_sibling(old_item);
-                }
+            plist_free(key_node);
-        }
+            plist_free(old_item);
-        return;
+        }
+    }
+    return;
 }
 static char compare_node_value(plist_type type, plist_data_t data, const void *value, uint64_t length)
 {
-        char res = FALSE;
+    char res = FALSE;
-        switch (type) {
+    switch (type)
-        case PLIST_BOOLEAN:
+    {
-                res = data->boolval == *((char *) value) ? TRUE : FALSE;
+    case PLIST_BOOLEAN:
-                break;
+        res = data->boolval == *((char *) value) ? TRUE : FALSE;
-        case PLIST_UINT:
+        break;
-                res = data->intval == *((uint64_t *) value) ? TRUE : FALSE;
+    case PLIST_UINT:
-                break;
+        res = data->intval == *((uint64_t *) value) ? TRUE : FALSE;
-        case PLIST_REAL:
+        break;
-                res = data->realval == *((double *) value) ? TRUE : FALSE;
+    case PLIST_REAL:
-                break;
+        res = data->realval == *((double *) value) ? TRUE : FALSE;
-        case PLIST_KEY:
+        break;
-        case PLIST_STRING:
+    case PLIST_KEY:
-                res = !strcmp(data->strval, ((char *) value));
+    case PLIST_STRING:
-                break;
+        res = !strcmp(data->strval, ((char *) value));
-        case PLIST_DATA:
+        break;
-                res = !memcmp(data->buff, (char *) value, length);
+    case PLIST_DATA:
-                break;
+        res = !memcmp(data->buff, (char *) value, length);
-        case PLIST_DATE:
+        break;
-                res = !memcmp(&(data->timeval), value, sizeof(GTimeVal));
+    case PLIST_DATE:
-                break;
+        res = !memcmp(&(data->timeval), value, sizeof(GTimeVal));
-        case PLIST_ARRAY:
+        break;
-        case PLIST_DICT:
+    case PLIST_ARRAY:
-        default:
+    case PLIST_DICT:
-                break;
+    default:
-        }
+        break;
-        return res;
+    }
+    return res;
 }
 plist_t plist_access_pathv(plist_t plist, uint32_t length, va_list v)
 {
-        plist_t current = plist;
+    plist_t current = plist;
-        plist_type type = PLIST_NONE;
+    plist_type type = PLIST_NONE;
-        uint32_t i = 0;
+    uint32_t i = 0;
-        for (i = 0; i < length && current; i++) {
+    for (i = 0; i < length && current; i++)
-                type = plist_get_node_type(current);
+    {
-                
+        type = plist_get_node_type(current);
-                if (type == PLIST_ARRAY) {
-                        uint32_t index = va_arg(v, uint32_t);
+        if (type == PLIST_ARRAY)
-                        current = plist_array_get_item(current, index);
+        {
-                }
+            uint32_t index = va_arg(v, uint32_t);
-                else if (type == PLIST_DICT) {
+            current = plist_array_get_item(current, index);
-                        const char* key = va_arg(v, const char*);
+        }
-                        current = plist_dict_get_item(current, key);
+        else if (type == PLIST_DICT)
-                }
+        {
-        }
+            const char* key = va_arg(v, const char*);
-        return current;
+            current = plist_dict_get_item(current, key);
+        }
+    }
+    return current;
 }
 plist_t plist_access_path(plist_t plist, uint32_t length, ...)
 {
-        plist_t ret = NULL;
+    plist_t ret = NULL;
-        va_list v;
+    va_list v;
- 
-        va_start(v, length);
+    va_start(v, length);
-        ret = plist_access_pathv(plist, length, v);
+    ret = plist_access_pathv(plist, length, v);
-        va_end(v);
+    va_end(v);
-        return ret;
+    return ret;
 }
 static void plist_get_type_and_value(plist_t node, plist_type * type, void *value, uint64_t * length)
 {
-        plist_data_t data = NULL;
+    plist_data_t data = NULL;
-        if (!node)
+    if (!node)
-                return;
+        return;
-        data = plist_get_data(node);
+    data = plist_get_data(node);
-        *type = data->type;
+    *type = data->type;
-        *length = data->length;
+    *length = data->length;
-        switch (*type) {
+    switch (*type)
-        case PLIST_BOOLEAN:
+    {
-                *((char *) value) = data->boolval;
+    case PLIST_BOOLEAN:
-                break;
+        *((char *) value) = data->boolval;
-        case PLIST_UINT:
+        break;
-                *((uint64_t *) value) = data->intval;
+    case PLIST_UINT:
-                break;
+        *((uint64_t *) value) = data->intval;
-        case PLIST_REAL:
+        break;
-                *((double *) value) = data->realval;
+    case PLIST_REAL:
-                break;
+        *((double *) value) = data->realval;
-        case PLIST_KEY:
+        break;
-        case PLIST_STRING:
+    case PLIST_KEY:
-                *((char **) value) = strdup(data->strval);
+    case PLIST_STRING:
-                break;
+        *((char **) value) = strdup(data->strval);
-        case PLIST_DATA:
+        break;
-                *((uint8_t **) value) = (uint8_t *) malloc(*length * sizeof(uint8_t));
+    case PLIST_DATA:
-                memcpy(*((uint8_t **) value), data->buff, *length * sizeof(uint8_t));
+        *((uint8_t **) value) = (uint8_t *) malloc(*length * sizeof(uint8_t));
-                break;
+        memcpy(*((uint8_t **) value), data->buff, *length * sizeof(uint8_t));
-        case PLIST_DATE:
+        break;
-                //exception : here we use memory on the stack since it is just a temporary buffer
+    case PLIST_DATE:
-                ((GTimeVal *) value)->tv_sec = data->timeval.tv_sec;
+        //exception : here we use memory on the stack since it is just a temporary buffer
-                ((GTimeVal *) value)->tv_usec = data->timeval.tv_usec;
+        ((GTimeVal *) value)->tv_sec = data->timeval.tv_sec;
-                break;
+        ((GTimeVal *) value)->tv_usec = data->timeval.tv_usec;
-        case PLIST_ARRAY:
+        break;
-        case PLIST_DICT:
+    case PLIST_ARRAY:
-        default:
+    case PLIST_DICT:
-                break;
+    default:
-        }
+        break;
+    }
 }
 plist_t plist_get_parent(plist_t node)
 {
-        return node ? (plist_t) ((GNode *) node)->parent : NULL;
+    return node ? (plist_t) ((GNode *) node)->parent : NULL;
 }
 plist_type plist_get_node_type(plist_t node)
 {
-        if (node) {
+    if (node)
-                plist_data_t data = plist_get_data(node);
+    {
-                if (data)
+        plist_data_t data = plist_get_data(node);
-                        return data->type;
+        if (data)
-        }
+            return data->type;
-        return PLIST_NONE;
+    }
+    return PLIST_NONE;
 }
 void plist_get_key_val(plist_t node, char **val)
 {
-        plist_type type = plist_get_node_type(node);
+    plist_type type = plist_get_node_type(node);
-        uint64_t length = 0;
+    uint64_t length = 0;
-        if (PLIST_KEY == type)
+    if (PLIST_KEY == type)
-                plist_get_type_and_value(node, &type, (void *) val, &length);
+        plist_get_type_and_value(node, &type, (void *) val, &length);
-        assert(length == strlen(*val));
+    assert(length == strlen(*val));
 }
 void plist_get_string_val(plist_t node, char **val)
 {
-        plist_type type = plist_get_node_type(node);
+    plist_type type = plist_get_node_type(node);
-        uint64_t length = 0;
+    uint64_t length = 0;
-        if (PLIST_STRING == type)
+    if (PLIST_STRING == type)
-                plist_get_type_and_value(node, &type, (void *) val, &length);
+        plist_get_type_and_value(node, &type, (void *) val, &length);
-        assert(length == strlen(*val));
+    assert(length == strlen(*val));
 }
 void plist_get_bool_val(plist_t node, uint8_t * val)
 {
-        plist_type type = plist_get_node_type(node);
+    plist_type type = plist_get_node_type(node);
-        uint64_t length = 0;
+    uint64_t length = 0;
-        if (PLIST_BOOLEAN == type)
+    if (PLIST_BOOLEAN == type)
-                plist_get_type_and_value(node, &type, (void *) val, &length);
+        plist_get_type_and_value(node, &type, (void *) val, &length);
-        assert(length == sizeof(uint8_t));
+    assert(length == sizeof(uint8_t));
 }
 void plist_get_uint_val(plist_t node, uint64_t * val)
 {
-        plist_type type = plist_get_node_type(node);
+    plist_type type = plist_get_node_type(node);
-        uint64_t length = 0;
+    uint64_t length = 0;
-        if (PLIST_UINT == type)
+    if (PLIST_UINT == type)
-                plist_get_type_and_value(node, &type, (void *) val, &length);
+        plist_get_type_and_value(node, &type, (void *) val, &length);
-        assert(length == sizeof(uint64_t));
+    assert(length == sizeof(uint64_t));
 }
 void plist_get_real_val(plist_t node, double *val)
 {
-        plist_type type = plist_get_node_type(node);
+    plist_type type = plist_get_node_type(node);
-        uint64_t length = 0;
+    uint64_t length = 0;
-        if (PLIST_REAL == type)
+    if (PLIST_REAL == type)
-                plist_get_type_and_value(node, &type, (void *) val, &length);
+        plist_get_type_and_value(node, &type, (void *) val, &length);
-        assert(length == sizeof(double));
+    assert(length == sizeof(double));
 }
 void plist_get_data_val(plist_t node, char **val, uint64_t * length)
 {
-        plist_type type = plist_get_node_type(node);
+    plist_type type = plist_get_node_type(node);
-        if (PLIST_DATA == type)
+    if (PLIST_DATA == type)
-                plist_get_type_and_value(node, &type, (void *) val, length);
+        plist_get_type_and_value(node, &type, (void *) val, length);
 }
 void plist_get_date_val(plist_t node, int32_t * sec, int32_t * usec)
 {
-        plist_type type = plist_get_node_type(node);
+    plist_type type = plist_get_node_type(node);
-        uint64_t length = 0;
+    uint64_t length = 0;
-        GTimeVal val = { 0, 0 };
+    GTimeVal val = { 0, 0 };
-        if (PLIST_DATE == type)
+    if (PLIST_DATE == type)
-                plist_get_type_and_value(node, &type, (void *) &val, &length);
+        plist_get_type_and_value(node, &type, (void *) &val, &length);
-        assert(length == sizeof(GTimeVal));
+    assert(length == sizeof(GTimeVal));
-        *sec = val.tv_sec;
+    *sec = val.tv_sec;
-        *usec = val.tv_usec;
+    *usec = val.tv_usec;
 }
 gboolean plist_data_compare(gconstpointer a, gconstpointer b)
 {
-        plist_data_t val_a = NULL;
+    plist_data_t val_a = NULL;
-        plist_data_t val_b = NULL;
+    plist_data_t val_b = NULL;
-        if (!a || !b)
+    if (!a || !b)
-                return FALSE;
+        return FALSE;
-        if (!((GNode *) a)->data || !((GNode *) b)->data)
+    if (!((GNode *) a)->data || !((GNode *) b)->data)
-                return FALSE;
+        return FALSE;
-        val_a = plist_get_data((plist_t) a);
+    val_a = plist_get_data((plist_t) a);
-        val_b = plist_get_data((plist_t) b);
+    val_b = plist_get_data((plist_t) b);
-        if (val_a->type != val_b->type)
+    if (val_a->type != val_b->type)
-                return FALSE;
+        return FALSE;
-        switch (val_a->type) {
+    switch (val_a->type)
-        case PLIST_BOOLEAN:
+    {
-        case PLIST_UINT:
+    case PLIST_BOOLEAN:
-        case PLIST_REAL:
+    case PLIST_UINT:
-                if (val_a->intval == val_b->intval)     //it is an union so this is sufficient
+    case PLIST_REAL:
-                        return TRUE;
+        if (val_a->intval == val_b->intval)     //it is an union so this is sufficient
-                else
+            return TRUE;
-                        return FALSE;
+        else
+            return FALSE;
-        case PLIST_KEY:
-        case PLIST_STRING:
+    case PLIST_KEY:
-                if (!strcmp(val_a->strval, val_b->strval))
+    case PLIST_STRING:
-                        return TRUE;
+        if (!strcmp(val_a->strval, val_b->strval))
-                else
+            return TRUE;
-                        return FALSE;
+        else
+            return FALSE;
-        case PLIST_DATA:
-                if (!memcmp(val_a->buff, val_b->buff, val_a->length))
+    case PLIST_DATA:
-                        return TRUE;
+        if (!memcmp(val_a->buff, val_b->buff, val_a->length))
-                else
+            return TRUE;
-                        return FALSE;
+        else
-        case PLIST_ARRAY:
+            return FALSE;
-        case PLIST_DICT:
+    case PLIST_ARRAY:
-                //compare pointer
+    case PLIST_DICT:
-                if (a == b)
+        //compare pointer
-                        return TRUE;
+        if (a == b)
-                else
+            return TRUE;
-                        return FALSE;
+        else
-                break;
+            return FALSE;
-        case PLIST_DATE:
+        break;
-                if (!memcmp(&(val_a->timeval), &(val_b->timeval), sizeof(GTimeVal)))
+    case PLIST_DATE:
-                        return TRUE;
+        if (!memcmp(&(val_a->timeval), &(val_b->timeval), sizeof(GTimeVal)))
-                else
+            return TRUE;
-                        return FALSE;
+        else
-        default:
+            return FALSE;
-                break;
+    default:
-        }
+        break;
-        return FALSE;
+    }
+    return FALSE;
 }
 char plist_compare_node_value(plist_t node_l, plist_t node_r)
 {
-        return plist_data_compare(node_l, node_r);
+    return plist_data_compare(node_l, node_r);
 }
 static void plist_set_element_val(plist_t node, plist_type type, const void *value, uint64_t length)
 {
-        //free previous allocated buffer
+    //free previous allocated buffer
-        plist_data_t data = plist_get_data(node);
+    plist_data_t data = plist_get_data(node);
-        assert(data);                           // a node should always have data attached
+    assert(data);                               // a node should always have data attached
-        switch (data->type) {
+    switch (data->type)
-        case PLIST_KEY:
+    {
-        case PLIST_STRING:
+    case PLIST_KEY:
-                free(data->strval);
+    case PLIST_STRING:
-                data->strval = NULL;
+        free(data->strval);
-                break;
+        data->strval = NULL;
-        case PLIST_DATA:
+        break;
-                free(data->buff);
+    case PLIST_DATA:
-                data->buff = NULL;
+        free(data->buff);
-                break;
+        data->buff = NULL;
-        default:
+        break;
-                break;
+    default:
-        }
+        break;
+    }
-        //now handle value
+    //now handle value
-        data->type = type;
-        data->length = length;
+    data->type = type;
+    data->length = length;
-        switch (type) {
-        case PLIST_BOOLEAN:
+    switch (type)
-                data->boolval = *((char *) value);
+    {
-                break;
+    case PLIST_BOOLEAN:
-        case PLIST_UINT:
+        data->boolval = *((char *) value);
-                data->intval = *((uint64_t *) value);
+        break;
-                break;
+    case PLIST_UINT:
-        case PLIST_REAL:
+        data->intval = *((uint64_t *) value);
-                data->realval = *((double *) value);
+        break;
-                break;
+    case PLIST_REAL:
-        case PLIST_KEY:
+        data->realval = *((double *) value);
-        case PLIST_STRING:
+        break;
-                data->strval = strdup((char *) value);
+    case PLIST_KEY:
-                break;
+    case PLIST_STRING:
-        case PLIST_DATA:
+        data->strval = strdup((char *) value);
-                data->buff = (uint8_t *) malloc(length);
+        break;
-                memcpy(data->buff, value, length);
+    case PLIST_DATA:
-                break;
+        data->buff = (uint8_t *) malloc(length);
-        case PLIST_DATE:
+        memcpy(data->buff, value, length);
-                data->timeval.tv_sec = ((GTimeVal *) value)->tv_sec;
+        break;
-                data->timeval.tv_usec = ((GTimeVal *) value)->tv_usec;
+    case PLIST_DATE:
-                break;
+        data->timeval.tv_sec = ((GTimeVal *) value)->tv_sec;
-        case PLIST_ARRAY:
+        data->timeval.tv_usec = ((GTimeVal *) value)->tv_usec;
-        case PLIST_DICT:
+        break;
-        default:
+    case PLIST_ARRAY:
-                break;
+    case PLIST_DICT:
-        }
+    default:
+        break;
+    }
 }
 void plist_set_type(plist_t node, plist_type type)
 {
-        if ( g_node_n_children(node) == 0 ) {
+    if ( g_node_n_children(node) == 0 )
-                plist_data_t data = plist_get_data(node);
+    {
-                plist_free_data( data );
+        plist_data_t data = plist_get_data(node);
-                data = plist_new_plist_data();
+        plist_free_data( data );
-                data->type = type;
+        data = plist_new_plist_data();
-                switch(type){
+        data->type = type;
-                case PLIST_BOOLEAN:
+        switch (type)
-                        data->length = sizeof(uint8_t);
+        {
-                        break;
+        case PLIST_BOOLEAN:
-                case PLIST_UINT:
+            data->length = sizeof(uint8_t);
-                        data->length = sizeof(uint64_t);
+            break;
-                        break;
+        case PLIST_UINT:
-                case PLIST_REAL:
+            data->length = sizeof(uint64_t);
-                        data->length = sizeof(double);
+            break;
-                        break;
+        case PLIST_REAL:
-                case PLIST_DATE:
+            data->length = sizeof(double);
-                        data->length = sizeof(GTimeVal);
+            break;
-                        break;
+        case PLIST_DATE:
-                default:
+            data->length = sizeof(GTimeVal);
-                        data->length = 0;
+            break;
-                        break;
+        default:
-                }
+            data->length = 0;
-        }
+            break;
+        }
+    }
 }
 void plist_set_key_val(plist_t node, const char *val)
 {
-        plist_set_element_val(node, PLIST_KEY, val, strlen(val));
+    plist_set_element_val(node, PLIST_KEY, val, strlen(val));
 }
 void plist_set_string_val(plist_t node, const char *val)
 {
-        plist_set_element_val(node, PLIST_STRING, val, strlen(val));
+    plist_set_element_val(node, PLIST_STRING, val, strlen(val));
 }
 void plist_set_bool_val(plist_t node, uint8_t val)
 {
-        plist_set_element_val(node, PLIST_BOOLEAN, &val, sizeof(uint8_t));
+    plist_set_element_val(node, PLIST_BOOLEAN, &val, sizeof(uint8_t));
 }
 void plist_set_uint_val(plist_t node, uint64_t val)
 {
-        plist_set_element_val(node, PLIST_UINT, &val, sizeof(uint64_t));
+    plist_set_element_val(node, PLIST_UINT, &val, sizeof(uint64_t));
 }
 void plist_set_real_val(plist_t node, double val)
 {
-        plist_set_element_val(node, PLIST_REAL, &val, sizeof(double));
+    plist_set_element_val(node, PLIST_REAL, &val, sizeof(double));
 }
 void plist_set_data_val(plist_t node, const char *val, uint64_t length)
 {
-        plist_set_element_val(node, PLIST_DATA, val, length);
+    plist_set_element_val(node, PLIST_DATA, val, length);
 }
 void plist_set_date_val(plist_t node, int32_t sec, int32_t usec)
 {
-        GTimeVal val = { sec, usec };
+    GTimeVal val = { sec, usec };
-        plist_set_element_val(node, PLIST_DATE, &val, sizeof(GTimeVal));
+    plist_set_element_val(node, PLIST_DATE, &val, sizeof(GTimeVal));
 }
 //DEPRECATED API BELOW
@@ -748,176 +791,187 @@ void plist_set_date_val(plist_t node, int32_t sec, int32_t usec)
 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
+    //only structured types can have children
-        plist_type node_type = plist_get_node_type(node);
+    plist_type node_type = plist_get_node_type(node);
-        if (node_type == PLIST_DICT || node_type == PLIST_ARRAY) {
+    if (node_type == PLIST_DICT || node_type == PLIST_ARRAY)
-                //only structured types are allowed to have nulll value
+    {
-                if (value || (!value && (type == PLIST_DICT || type == PLIST_ARRAY))) {
+        //only structured types are allowed to have nulll value
+        if (value || (!value && (type == PLIST_DICT || type == PLIST_ARRAY)))
-                        plist_t subnode = NULL;
+        {
-                        //now handle value
+            plist_t subnode = NULL;
-                        plist_data_t data = plist_new_plist_data();
-                        data->type = type;
+            //now handle value
-                        data->length = length;
+            plist_data_t data = plist_new_plist_data();
+            data->type = type;
-                        switch (type) {
+            data->length = length;
-                        case PLIST_BOOLEAN:
-                                data->boolval = *((char *) value);
+            switch (type)
-                                break;
+            {
-                        case PLIST_UINT:
+            case PLIST_BOOLEAN:
-                                data->intval = *((uint64_t *) value);
+                data->boolval = *((char *) value);
-                                break;
+                break;
-                        case PLIST_REAL:
+            case PLIST_UINT:
-                                data->realval = *((double *) value);
+                data->intval = *((uint64_t *) value);
-                                break;
+                break;
-                        case PLIST_KEY:
+            case PLIST_REAL:
-                        case PLIST_STRING:
+                data->realval = *((double *) value);
-                                data->strval = strdup((char *) value);
+                break;
-                                break;
+            case PLIST_KEY:
-                        case PLIST_DATA:
+            case PLIST_STRING:
-                                data->buff = (uint8_t *) malloc(length);
+                data->strval = strdup((char *) value);
-                                memcpy(data->buff, value, length);
+                break;
-                                break;
+            case PLIST_DATA:
-                        case PLIST_DATE:
+                data->buff = (uint8_t *) malloc(length);
-                                data->timeval.tv_sec = ((GTimeVal *) value)->tv_sec;
+                memcpy(data->buff, value, length);
-                                data->timeval.tv_usec = ((GTimeVal *) value)->tv_usec;
+                break;
-                                break;
+            case PLIST_DATE:
-                        case PLIST_ARRAY:
+                data->timeval.tv_sec = ((GTimeVal *) value)->tv_sec;
-                        case PLIST_DICT:
+                data->timeval.tv_usec = ((GTimeVal *) value)->tv_usec;
-                        default:
+                break;
-                                break;
+            case PLIST_ARRAY:
-                        }
+            case PLIST_DICT:
+            default:
-                        subnode = plist_new_node(data);
+                break;
-                        if (node)
+            }
-                                g_node_append(node, subnode);
-                        return subnode;
+            subnode = plist_new_node(data);
-                } else
+            if (node)
-                        return NULL;
+                g_node_append(node, subnode);
-        }
+            return subnode;
-        return NULL;
+        }
+        else
+            return NULL;
+    }
+    return NULL;
 }
 plist_t plist_get_first_child(plist_t node)
 {
-        return (plist_t) g_node_first_child((GNode *) node);
+    return (plist_t) g_node_first_child((GNode *) node);
 }
 plist_t plist_get_next_sibling(plist_t node)
 {
-        return (plist_t) g_node_next_sibling((GNode *) node);
+    return (plist_t) g_node_next_sibling((GNode *) node);
 }
 plist_t plist_get_prev_sibling(plist_t node)
 {
-        return (plist_t) g_node_prev_sibling((GNode *) node);
+    return (plist_t) g_node_prev_sibling((GNode *) node);
 }
 plist_t plist_get_array_nth_el(plist_t node, uint32_t n)
 {
-        plist_t ret = NULL;
+    plist_t ret = NULL;
-        if (node && PLIST_ARRAY == plist_get_node_type(node)) {
+    if (node && PLIST_ARRAY == plist_get_node_type(node))
-                uint32_t i = 0;
+    {
-                plist_t temp = plist_get_first_child(node);
+        uint32_t i = 0;
+        plist_t temp = plist_get_first_child(node);
-                while (i <= n && temp) {
+        while (i <= n && temp)
-                        if (i == n)
+        {
-                                ret = temp;
+            if (i == n)
-                        temp = plist_get_next_sibling(temp);
+                ret = temp;
-                        i++;
+            temp = plist_get_next_sibling(temp);
-                }
+            i++;
-        }
+        }
-        return ret;
+    }
+    return ret;
 }
 plist_t plist_get_dict_el_from_key(plist_t node, const char *key)
 {
-        plist_t ret = NULL;
+    plist_t ret = NULL;
-        if (node && PLIST_DICT == plist_get_node_type(node)) {
+    if (node && PLIST_DICT == plist_get_node_type(node))
+    {
-                plist_t key_node = plist_find_node_by_key(node, key);
+        plist_t key_node = plist_find_node_by_key(node, key);
-                ret = plist_get_next_sibling(key_node);
+        ret = plist_get_next_sibling(key_node);
-        }
+    }
-        return ret;
+    return ret;
 }
 void plist_add_sub_node(plist_t node, plist_t subnode)
 {
-        if (node && subnode) {
+    if (node && subnode)
-                plist_type type = plist_get_node_type(node);
+    {
-                if (type == PLIST_DICT || type == PLIST_ARRAY)
+        plist_type type = plist_get_node_type(node);
-                        g_node_append(node, subnode);
+        if (type == PLIST_DICT || type == PLIST_ARRAY)
-        }
+            g_node_append(node, subnode);
+    }
 }
 void plist_add_sub_key_el(plist_t node, const char *val)
 {
-        plist_add_sub_element(node, PLIST_KEY, val, strlen(val));
+    plist_add_sub_element(node, PLIST_KEY, val, strlen(val));
 }
 void plist_add_sub_string_el(plist_t node, const char *val)
 {
-        plist_add_sub_element(node, PLIST_STRING, val, strlen(val));
+    plist_add_sub_element(node, PLIST_STRING, val, strlen(val));
 }
 void plist_add_sub_bool_el(plist_t node, uint8_t val)
 {
-        plist_add_sub_element(node, PLIST_BOOLEAN, &val, sizeof(uint8_t));
+    plist_add_sub_element(node, PLIST_BOOLEAN, &val, sizeof(uint8_t));
 }
 void plist_add_sub_uint_el(plist_t node, uint64_t val)
 {
-        plist_add_sub_element(node, PLIST_UINT, &val, sizeof(uint64_t));
+    plist_add_sub_element(node, PLIST_UINT, &val, sizeof(uint64_t));
 }
 void plist_add_sub_real_el(plist_t node, double val)
 {
-        plist_add_sub_element(node, PLIST_REAL, &val, sizeof(double));
+    plist_add_sub_element(node, PLIST_REAL, &val, sizeof(double));
 }
 void plist_add_sub_data_el(plist_t node, const char *val, uint64_t length)
 {
-        plist_add_sub_element(node, PLIST_DATA, val, length);
+    plist_add_sub_element(node, PLIST_DATA, val, length);
 }
 void plist_add_sub_date_el(plist_t node, int32_t sec, int32_t usec)
 {
-        GTimeVal val = { sec, usec };
+    GTimeVal val = { sec, usec };
-        plist_add_sub_element(node, PLIST_DATE, &val, sizeof(GTimeVal));
+    plist_add_sub_element(node, PLIST_DATE, &val, sizeof(GTimeVal));
 }
 static plist_t plist_find_node(plist_t plist, plist_type type, const void *value, uint64_t length)
 {
-        plist_t current = NULL;
+    plist_t current = NULL;
-        if (!plist)
+    if (!plist)
-                return NULL;
+        return NULL;
-        for (current = (plist_t)g_node_first_child(plist); current; current = (plist_t)g_node_next_sibling(current)) {
+    for (current = (plist_t)g_node_first_child(plist); current; current = (plist_t)g_node_next_sibling(current))
+    {
-                plist_data_t data = plist_get_data(current);
+        plist_data_t data = plist_get_data(current);
-                if (data->type == type && data->length == length && compare_node_value(type, data, value, length)) {
+        if (data->type == type && data->length == length && compare_node_value(type, data, value, length))
-                        return current;
+        {
-                }
+            return current;
-                if (data->type == PLIST_DICT || data->type == PLIST_ARRAY) {
+        }
-                        plist_t sub = plist_find_node(current, type, value, length);
+        if (data->type == PLIST_DICT || data->type == PLIST_ARRAY)
-                        if (sub)
+        {
-                                return sub;
+            plist_t sub = plist_find_node(current, type, value, length);
-                }
+            if (sub)
-        }
+                return sub;
-        return NULL;
+        }
+    }
+    return NULL;
 }
 plist_t plist_find_node_by_key(plist_t plist, const char *value)
 {
-        return plist_find_node(plist, PLIST_KEY, value, strlen(value));
+    return plist_find_node(plist, PLIST_KEY, value, strlen(value));
 }
 plist_t plist_find_node_by_string(plist_t plist, const char *value)
 {
-        return plist_find_node(plist, PLIST_STRING, value, strlen(value));
+    return plist_find_node(plist, PLIST_STRING, value, strlen(value));
 }
diff --git a/src/plist.h b/src/plist.h
index b642d74..b9f12d5 100644
--- a/src/plist.h
+++ b/src/plist.h
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #ifndef PLIST_H
@@ -35,17 +35,19 @@
 #endif
-struct plist_data_s {
+struct plist_data_s
-        union {
+{
-                char boolval;
+    union
-                uint64_t intval;
+    {
-                double realval;
+        char boolval;
-                char *strval;
+        uint64_t intval;
-                uint8_t *buff;
+        double realval;
-                GTimeVal timeval;
+        char *strval;
-        };
+        uint8_t *buff;
-        uint64_t length;
+        GTimeVal timeval;
-        plist_type type;
+    };
+    uint64_t length;
+    plist_type type;
 };
 typedef struct plist_data_s *plist_data_t;
diff --git a/src/xplist.c b/src/xplist.c
index 490367e..15c9497 100644
--- a/src/xplist.c
+++ b/src/xplist.c
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
@@ -50,7 +50,7 @@ static const char *plist_base = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
 /** Formats a block of text to be a given indentation and width.
- * 
+ *
 * The total width of the return string will be depth + cols.
 *
 * @param buf The string to format.
@@ -61,303 +61,323 @@ static const char *plist_base = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
 */
 static gchar *format_string(const char *buf, int cols, int depth)
 {
-        int colw = depth + cols + 1;
+    int colw = depth + cols + 1;
-        int len = strlen(buf);
+    int len = strlen(buf);
-        int nlines = len / cols + 1;
+    int nlines = len / cols + 1;
-        gchar *new_buf = (gchar *) g_malloc0(nlines * colw + depth + 1);
+    gchar *new_buf = (gchar *) g_malloc0(nlines * colw + depth + 1);
-        int i = 0;
+    int i = 0;
-        int j = 0;
+    int j = 0;
-        assert(cols >= 0);
+    assert(cols >= 0);
-        assert(depth >= 0);
+    assert(depth >= 0);
-        // Inserts new lines and tabs at appropriate locations
+    // Inserts new lines and tabs at appropriate locations
-        for (i = 0; i < nlines; i++) {
+    for (i = 0; i < nlines; i++)
-                new_buf[i * colw] = '\n';
+    {
-                for (j = 0; j < depth; j++)
+        new_buf[i * colw] = '\n';
-                        new_buf[i * colw + 1 + j] = '\t';
+        for (j = 0; j < depth; j++)
-                memcpy(new_buf + i * colw + 1 + depth, buf + i * cols, (i + 1) * cols <= len ? cols : len - i * cols);
+            new_buf[i * colw + 1 + j] = '\t';
-        }
+        memcpy(new_buf + i * colw + 1 + depth, buf + i * cols, (i + 1) * cols <= len ? cols : len - i * cols);
-        new_buf[len + (1 + depth) * nlines] = '\n';
+    }
+    new_buf[len + (1 + depth) * nlines] = '\n';
-        // Inserts final row of indentation and termination character
-        for (j = 0; j < depth; j++)
+    // Inserts final row of indentation and termination character
-                new_buf[len + (1 + depth) * nlines + 1 + j] = '\t';
+    for (j = 0; j < depth; j++)
-        new_buf[len + (1 + depth) * nlines + depth + 1] = '\0';
+        new_buf[len + (1 + depth) * nlines + 1 + j] = '\t';
+    new_buf[len + (1 + depth) * nlines + depth + 1] = '\0';
-        return new_buf;
+    return new_buf;
 }
-struct xml_node {
+struct xml_node
-        xmlNodePtr xml;
+{
-        uint32_t depth;
+    xmlNodePtr xml;
+    uint32_t depth;
 };
 /** Creates a new plist XML document.
- * 
+ *
 * @return The plist XML document.
 */
 static xmlDocPtr new_xml_plist(void)
 {
-        char *plist = strdup(plist_base);
+    char *plist = strdup(plist_base);
-        xmlDocPtr plist_xml = xmlParseMemory(plist, strlen(plist));
+    xmlDocPtr plist_xml = xmlParseMemory(plist, strlen(plist));
-        if (!plist_xml)
+    if (!plist_xml)
-                return NULL;
+        return NULL;
-        free(plist);
+    free(plist);
-        return plist_xml;
+    return plist_xml;
 }
 static void node_to_xml(GNode * node, gpointer xml_struct)
 {
-        struct xml_node *xstruct = NULL;
+    struct xml_node *xstruct = NULL;
-        plist_data_t node_data = NULL;
+    plist_data_t node_data = NULL;
-        xmlNodePtr child_node = NULL;
+    xmlNodePtr child_node = NULL;
-        char isStruct = FALSE;
+    char isStruct = FALSE;
-        const xmlChar *tag = NULL;
+    const xmlChar *tag = NULL;
-        gchar *val = NULL;
+    gchar *val = NULL;
-        //for base64
+    //for base64
-        gchar *valtmp = NULL;
+    gchar *valtmp = NULL;
-        uint32_t i = 0;
+    uint32_t i = 0;
-        if (!node)
+    if (!node)
-                return;
+        return;
-        xstruct = (struct xml_node *) xml_struct;
+    xstruct = (struct xml_node *) xml_struct;
-        node_data = plist_get_data(node);
+    node_data = plist_get_data(node);
-        switch (node_data->type) {
+    switch (node_data->type)
-        case PLIST_BOOLEAN:
+    {
-                {
+    case PLIST_BOOLEAN:
-                        if (node_data->boolval)
+    {
-                                tag = XPLIST_TRUE;
+        if (node_data->boolval)
-                        else
+            tag = XPLIST_TRUE;
-                                tag = XPLIST_FALSE;
+        else
-                }
+            tag = XPLIST_FALSE;
-                break;
+    }
+    break;
-        case PLIST_UINT:
-                tag = XPLIST_INT;
+    case PLIST_UINT:
-                val = g_strdup_printf("%llu", node_data->intval);
+        tag = XPLIST_INT;
-                break;
+        val = g_strdup_printf("%llu", node_data->intval);
+        break;
-        case PLIST_REAL:
-                tag = XPLIST_REAL;
+    case PLIST_REAL:
-                val = g_strdup_printf("%f", node_data->realval);
+        tag = XPLIST_REAL;
-                break;
+        val = g_strdup_printf("%f", node_data->realval);
+        break;
-        case PLIST_STRING:
-                tag = XPLIST_STRING;
+    case PLIST_STRING:
-                val = g_strdup(node_data->strval);
+        tag = XPLIST_STRING;
-                break;
+        val = g_strdup(node_data->strval);
+        break;
-        case PLIST_KEY:
-                tag = XPLIST_KEY;
+    case PLIST_KEY:
-                val = g_strdup((gchar *) node_data->strval);
+        tag = XPLIST_KEY;
-                break;
+        val = g_strdup((gchar *) node_data->strval);
+        break;
-        case PLIST_DATA:
-                tag = XPLIST_DATA;
+    case PLIST_DATA:
-                if (node_data->length) {
+        tag = XPLIST_DATA;
-                        valtmp = g_base64_encode(node_data->buff, node_data->length);
+        if (node_data->length)
-                        val = format_string(valtmp, 60, xstruct->depth);
+        {
-                        g_free(valtmp);
+            valtmp = g_base64_encode(node_data->buff, node_data->length);
-                }
+            val = format_string(valtmp, 60, xstruct->depth);
-                break;
+            g_free(valtmp);
-        case PLIST_ARRAY:
+        }
-                tag = XPLIST_ARRAY;
+        break;
-                isStruct = TRUE;
+    case PLIST_ARRAY:
-                break;
+        tag = XPLIST_ARRAY;
-        case PLIST_DICT:
+        isStruct = TRUE;
-                tag = XPLIST_DICT;
+        break;
-                isStruct = TRUE;
+    case PLIST_DICT:
-                break;
+        tag = XPLIST_DICT;
-        case PLIST_DATE:
+        isStruct = TRUE;
-                tag = XPLIST_DATE;
+        break;
-                val = g_time_val_to_iso8601(&node_data->timeval);
+    case PLIST_DATE:
-                break;
+        tag = XPLIST_DATE;
-        default:
+        val = g_time_val_to_iso8601(&node_data->timeval);
-                break;
+        break;
-        }
+    default:
+        break;
-        for (i = 0; i < xstruct->depth; i++) {
+    }
-                xmlNodeAddContent(xstruct->xml, BAD_CAST("\t"));
-        }
+    for (i = 0; i < xstruct->depth; i++)
-        child_node = xmlNewChild(xstruct->xml, NULL, tag, BAD_CAST(val));
+    {
-        xmlNodeAddContent(xstruct->xml, BAD_CAST("\n"));
+        xmlNodeAddContent(xstruct->xml, BAD_CAST("\t"));
-        g_free(val);
+    }
+    child_node = xmlNewChild(xstruct->xml, NULL, tag, BAD_CAST(val));
-        //add return for structured types
+    xmlNodeAddContent(xstruct->xml, BAD_CAST("\n"));
-        if (node_data->type == PLIST_ARRAY || node_data->type == PLIST_DICT)
+    g_free(val);
-                xmlNodeAddContent(child_node, BAD_CAST("\n"));
+    //add return for structured types
-        if (isStruct) {
+    if (node_data->type == PLIST_ARRAY || node_data->type == PLIST_DICT)
-                struct xml_node child = { child_node, xstruct->depth + 1 };
+        xmlNodeAddContent(child_node, BAD_CAST("\n"));
-                g_node_children_foreach(node, G_TRAVERSE_ALL, node_to_xml, &child);
-        }
+    if (isStruct)
-        //fix indent for structured types
+    {
-        if (node_data->type == PLIST_ARRAY || node_data->type == PLIST_DICT) {
+        struct xml_node child = { child_node, xstruct->depth + 1 };
+        g_node_children_foreach(node, G_TRAVERSE_ALL, node_to_xml, &child);
-                for (i = 0; i < xstruct->depth; i++) {
+    }
-                        xmlNodeAddContent(child_node, BAD_CAST("\t"));
+    //fix indent for structured types
-                }
+    if (node_data->type == PLIST_ARRAY || node_data->type == PLIST_DICT)
-        }
+    {
-        return;
+        for (i = 0; i < xstruct->depth; i++)
+        {
+            xmlNodeAddContent(child_node, BAD_CAST("\t"));
+        }
+    }
+    return;
 }
 static void xml_to_node(xmlNodePtr xml_node, plist_t * plist_node)
 {
-        xmlNodePtr node = NULL;
+    xmlNodePtr node = NULL;
-        plist_data_t data = NULL;
+    plist_data_t data = NULL;
-        plist_t subnode = NULL;
+    plist_t subnode = NULL;
-        //for string
+    //for string
-        glong len = 0;
+    glong len = 0;
-        int type = 0;
+    int type = 0;
-        if (!xml_node)
+    if (!xml_node)
-                return;
+        return;
-        for (node = xml_node->children; node; node = node->next) {
+    for (node = xml_node->children; node; node = node->next)
+    {
-                while (node && !xmlStrcmp(node->name, XPLIST_TEXT))
-                        node = node->next;
+        while (node && !xmlStrcmp(node->name, XPLIST_TEXT))
-                if (!node)
+            node = node->next;
-                        break;
+        if (!node)
+            break;
-                data = plist_new_plist_data();
-                subnode = plist_new_node(data);
+        data = plist_new_plist_data();
-                if (*plist_node)
+        subnode = plist_new_node(data);
-                        g_node_append(*plist_node, subnode);
+        if (*plist_node)
-                else
+            g_node_append(*plist_node, subnode);
-                        *plist_node = subnode;
+        else
+            *plist_node = subnode;
-                if (!xmlStrcmp(node->name, XPLIST_TRUE)) {
-                        data->boolval = TRUE;
+        if (!xmlStrcmp(node->name, XPLIST_TRUE))
-                        data->type = PLIST_BOOLEAN;
+        {
-                        data->length = 1;
+            data->boolval = TRUE;
-                        continue;
+            data->type = PLIST_BOOLEAN;
-                }
+            data->length = 1;
+            continue;
-                if (!xmlStrcmp(node->name, XPLIST_FALSE)) {
+        }
-                        data->boolval = FALSE;
-                        data->type = PLIST_BOOLEAN;
+        if (!xmlStrcmp(node->name, XPLIST_FALSE))
-                        data->length = 1;
+        {
-                        continue;
+            data->boolval = FALSE;
-                }
+            data->type = PLIST_BOOLEAN;
+            data->length = 1;
-                if (!xmlStrcmp(node->name, XPLIST_INT)) {
+            continue;
-                        xmlChar *strval = xmlNodeGetContent(node);
+        }
-                        data->intval = g_ascii_strtoull((char *) strval, NULL, 0);
-                        data->type = PLIST_UINT;
+        if (!xmlStrcmp(node->name, XPLIST_INT))
-                        data->length = 8;
+        {
-                        xmlFree(strval);
+            xmlChar *strval = xmlNodeGetContent(node);
-                        continue;
+            data->intval = g_ascii_strtoull((char *) strval, NULL, 0);
-                }
+            data->type = PLIST_UINT;
+            data->length = 8;
-                if (!xmlStrcmp(node->name, XPLIST_REAL)) {
+            xmlFree(strval);
-                        xmlChar *strval = xmlNodeGetContent(node);
+            continue;
-                        data->realval = atof((char *) strval);
+        }
-                        data->type = PLIST_REAL;
-                        data->length = 8;
+        if (!xmlStrcmp(node->name, XPLIST_REAL))
-                        xmlFree(strval);
+        {
-                        continue;
+            xmlChar *strval = xmlNodeGetContent(node);
-                }
+            data->realval = atof((char *) strval);
+            data->type = PLIST_REAL;
-                if (!xmlStrcmp(node->name, XPLIST_DATE)) {
+            data->length = 8;
-                        xmlChar *strval = xmlNodeGetContent(node);
+            xmlFree(strval);
-                        g_time_val_from_iso8601((char *) strval, &data->timeval);
+            continue;
-                        data->type = PLIST_DATE;
+        }
-                        data->length = sizeof(GTimeVal);
-                        xmlFree(strval);
+        if (!xmlStrcmp(node->name, XPLIST_DATE))
-                        continue;
+        {
-                }
+            xmlChar *strval = xmlNodeGetContent(node);
+            g_time_val_from_iso8601((char *) strval, &data->timeval);
-                if (!xmlStrcmp(node->name, XPLIST_STRING)) {
+            data->type = PLIST_DATE;
-                        xmlChar *strval = xmlNodeGetContent(node);
+            data->length = sizeof(GTimeVal);
-                        len = strlen((char *) strval);
+            xmlFree(strval);
-                        type = xmlDetectCharEncoding(strval, len);
+            continue;
+        }
-                        if (XML_CHAR_ENCODING_UTF8 == type || XML_CHAR_ENCODING_ASCII == type || XML_CHAR_ENCODING_NONE == type) {
-                                data->strval = strdup((char *) strval);
+        if (!xmlStrcmp(node->name, XPLIST_STRING))
-                                data->type = PLIST_STRING;
+        {
-                                data->length = strlen(data->strval);
+            xmlChar *strval = xmlNodeGetContent(node);
-                        }
+            len = strlen((char *) strval);
-                        xmlFree(strval);
+            type = xmlDetectCharEncoding(strval, len);
-                        continue;
-                }
+            if (XML_CHAR_ENCODING_UTF8 == type || XML_CHAR_ENCODING_ASCII == type || XML_CHAR_ENCODING_NONE == type)
+            {
-                if (!xmlStrcmp(node->name, XPLIST_KEY)) {
+                data->strval = strdup((char *) strval);
-                        xmlChar *strval = xmlNodeGetContent(node);
+                data->type = PLIST_STRING;
-                        data->strval = strdup((char *) strval);
+                data->length = strlen(data->strval);
-                        data->type = PLIST_KEY;
+            }
-                        data->length = strlen(data->strval);
+            xmlFree(strval);
-                        xmlFree(strval);
+            continue;
-                        continue;
+        }
-                }
+        if (!xmlStrcmp(node->name, XPLIST_KEY))
-                if (!xmlStrcmp(node->name, XPLIST_DATA)) {
+        {
-                        xmlChar *strval = xmlNodeGetContent(node);
+            xmlChar *strval = xmlNodeGetContent(node);
-                        gsize size = 0;
+            data->strval = strdup((char *) strval);
-                        guchar *dec = g_base64_decode((char *) strval, &size);
+            data->type = PLIST_KEY;
-                        data->buff = (uint8_t *) malloc(size * sizeof(uint8_t));
+            data->length = strlen(data->strval);
-                        memcpy(data->buff, dec, size * sizeof(uint8_t));
+            xmlFree(strval);
-                        g_free(dec);
+            continue;
-                        data->length = size;
+        }
-                        data->type = PLIST_DATA;
-                        xmlFree(strval);
+        if (!xmlStrcmp(node->name, XPLIST_DATA))
-                        continue;
+        {
-                }
+            xmlChar *strval = xmlNodeGetContent(node);
+            gsize size = 0;
-                if (!xmlStrcmp(node->name, XPLIST_ARRAY)) {
+            guchar *dec = g_base64_decode((char *) strval, &size);
-                        data->type = PLIST_ARRAY;
+            data->buff = (uint8_t *) malloc(size * sizeof(uint8_t));
-                        xml_to_node(node, &subnode);
+            memcpy(data->buff, dec, size * sizeof(uint8_t));
-                        continue;
+            g_free(dec);
-                }
+            data->length = size;
+            data->type = PLIST_DATA;
-                if (!xmlStrcmp(node->name, XPLIST_DICT)) {
+            xmlFree(strval);
-                        data->type = PLIST_DICT;
+            continue;
-                        xml_to_node(node, &subnode);
+        }
-                        continue;
-                }
+        if (!xmlStrcmp(node->name, XPLIST_ARRAY))
-        }
+        {
+            data->type = PLIST_ARRAY;
+            xml_to_node(node, &subnode);
+            continue;
+        }
+        if (!xmlStrcmp(node->name, XPLIST_DICT))
+        {
+            data->type = PLIST_DICT;
+            xml_to_node(node, &subnode);
+            continue;
+        }
+    }
 }
 void plist_to_xml(plist_t plist, char **plist_xml, uint32_t * length)
 {
-        xmlDocPtr plist_doc = NULL;
+    xmlDocPtr plist_doc = NULL;
-        xmlNodePtr root_node = NULL;
+    xmlNodePtr root_node = NULL;
-        struct xml_node root = { NULL, 0 };
+    struct xml_node root = { NULL, 0 };
-        int size = 0;
+    int size = 0;
-        if (!plist || !plist_xml || *plist_xml)
+    if (!plist || !plist_xml || *plist_xml)
-                return;
+        return;
-        plist_doc = new_xml_plist();
+    plist_doc = new_xml_plist();
-        root_node = xmlDocGetRootElement(plist_doc);
+    root_node = xmlDocGetRootElement(plist_doc);
-        root.xml = root_node;
+    root.xml = root_node;
-        node_to_xml(plist, &root);
+    node_to_xml(plist, &root);
-        xmlDocDumpMemory(plist_doc, (xmlChar **) plist_xml, &size);
+    xmlDocDumpMemory(plist_doc, (xmlChar **) plist_xml, &size);
-        if (size >= 0)
+    if (size >= 0)
-                *length = size;
+        *length = size;
-        xmlFreeDoc(plist_doc);
+    xmlFreeDoc(plist_doc);
 }
 void plist_from_xml(const char *plist_xml, uint32_t length, plist_t * plist)
 {
-        xmlDocPtr plist_doc = xmlParseMemory(plist_xml, length);
+    xmlDocPtr plist_doc = xmlParseMemory(plist_xml, length);
-        xmlNodePtr root_node = xmlDocGetRootElement(plist_doc);
+    xmlNodePtr root_node = xmlDocGetRootElement(plist_doc);
-        xml_to_node(root_node, plist);
+    xml_to_node(root_node, plist);
-        xmlFreeDoc(plist_doc);
+    xmlFreeDoc(plist_doc);
 }
diff --git a/test/plist_cmp.c b/test/plist_cmp.c
index 386264a..709e8d0 100644
--- a/test/plist_cmp.c
+++ b/test/plist_cmp.c
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
@@ -33,110 +33,114 @@
 char compare_plist(plist_t node_l, plist_t node_r)
 {
-        plist_t cur_l = NULL;
+    plist_t cur_l = NULL;
-        plist_t cur_r = NULL;
+    plist_t cur_r = NULL;
-        int res = 1;
+    int res = 1;
-        cur_l = plist_get_first_child(node_l);
+    cur_l = plist_get_first_child(node_l);
-        cur_r = plist_get_first_child(node_r);
+    cur_r = plist_get_first_child(node_r);
-        if ( (!cur_l && cur_r) || (cur_l && !cur_r))
+    if ( (!cur_l && cur_r) || (cur_l && !cur_r))
-                return 0;
+        return 0;
-        if ( !cur_l && !cur_r )
+    if ( !cur_l && !cur_r )
-                return plist_compare_node_value( node_l, node_r );
+        return plist_compare_node_value( node_l, node_r );
-        while(cur_l && cur_r && res) {
+    while (cur_l && cur_r && res)
+    {
-                if (!(res = compare_plist(cur_l, cur_r)))
+        if (!(res = compare_plist(cur_l, cur_r)))
-                        return res;
+            return res;
-                cur_l = plist_get_next_sibling(cur_l);
+        cur_l = plist_get_next_sibling(cur_l);
-                cur_r = plist_get_next_sibling(cur_r);
+        cur_r = plist_get_next_sibling(cur_r);
-                if ( (!cur_l && cur_r) || (cur_l && !cur_r))
+        if ( (!cur_l && cur_r) || (cur_l && !cur_r))
-                        return 0;
+            return 0;
-        }
+    }
-        return res;
+    return res;
 }
 int main(int argc, char *argv[])
 {
-        FILE *iplist1 = NULL;
+    FILE *iplist1 = NULL;
-        FILE *iplist2 = NULL;
+    FILE *iplist2 = NULL;
-        plist_t root_node1 = NULL;
+    plist_t root_node1 = NULL;
-        plist_t root_node2 = NULL;
+    plist_t root_node2 = NULL;
-        char *plist_1 = NULL;
+    char *plist_1 = NULL;
-        char *plist_2 = NULL;
+    char *plist_2 = NULL;
-        int size_in1 = 0;
+    int size_in1 = 0;
-        int size_in2 = 0;
+    int size_in2 = 0;
-        char *file_in1 = NULL;
+    char *file_in1 = NULL;
-        char *file_in2 = NULL;
+    char *file_in2 = NULL;
-        int res = 0;
+    int res = 0;
-        struct stat *filestats1 = (struct stat *) malloc(sizeof(struct stat));
+    struct stat *filestats1 = (struct stat *) malloc(sizeof(struct stat));
-        struct stat *filestats2 = (struct stat *) malloc(sizeof(struct stat));
+    struct stat *filestats2 = (struct stat *) malloc(sizeof(struct stat));
-        if (argc!= 3) {
+    if (argc!= 3)
-                printf("Wrong input\n");
+    {
-                return 1;
+        printf("Wrong input\n");
-        }
+        return 1;
+    }
-        file_in1 = argv[1];
-        file_in2 = argv[2];
+    file_in1 = argv[1];
+    file_in2 = argv[2];
-        //read input file
-        iplist1 = fopen(file_in1, "rb");
+    //read input file
-        iplist2 = fopen(file_in2, "rb");
+    iplist1 = fopen(file_in1, "rb");
+    iplist2 = fopen(file_in2, "rb");
-        if (!iplist1 || !iplist2) {
-                printf("File does not exists\n");
+    if (!iplist1 || !iplist2)
-                return 2;
+    {
-        }
+        printf("File does not exists\n");
+        return 2;
-        stat(file_in1, filestats1);
+    }
-        stat(file_in2, filestats2);
+    stat(file_in1, filestats1);
-        size_in1 = filestats1->st_size;
+    stat(file_in2, filestats2);
-        size_in2 = filestats2->st_size;
+    size_in1 = filestats1->st_size;
-        plist_1 = (char *) malloc(sizeof(char) * (size_in1 + 1));
+    size_in2 = filestats2->st_size;
-        plist_2 = (char *) malloc(sizeof(char) * (size_in2 + 1));
+    plist_1 = (char *) malloc(sizeof(char) * (size_in1 + 1));
-        fread(plist_1, sizeof(char), size_in1, iplist1);
+    plist_2 = (char *) malloc(sizeof(char) * (size_in2 + 1));
-        fread(plist_2, sizeof(char), size_in2, iplist2);
+    fread(plist_1, sizeof(char), size_in1, iplist1);
-        fclose(iplist1);
+    fread(plist_2, sizeof(char), size_in2, iplist2);
-        fclose(iplist2);
+    fclose(iplist1);
-        if (memcmp(plist_1, "bplist00", 8) == 0)
+    fclose(iplist2);
-                plist_from_bin(plist_1, size_in1, &root_node1);
-        else
+    if (memcmp(plist_1, "bplist00", 8) == 0)
-                plist_from_xml(plist_1, size_in1, &root_node1);
+        plist_from_bin(plist_1, size_in1, &root_node1);
+    else
-        if (memcmp(plist_2, "bplist00", 8) == 0)
+        plist_from_xml(plist_1, size_in1, &root_node1);
-                plist_from_bin(plist_2, size_in2, &root_node2);
-        else
+    if (memcmp(plist_2, "bplist00", 8) == 0)
-                plist_from_xml(plist_2, size_in2, &root_node2);
+        plist_from_bin(plist_2, size_in2, &root_node2);
+    else
-        if (!root_node1 || !root_node2) {
+        plist_from_xml(plist_2, size_in2, &root_node2);
-                printf("PList parsing failed\n");
-                return 3;
+    if (!root_node1 || !root_node2)
-        }
+    {
-        else
+        printf("PList parsing failed\n");
-                printf("PList parsing succeeded\n");
+        return 3;
+    }
-        res = compare_plist(root_node1, root_node2);
+    else
+        printf("PList parsing succeeded\n");
-        plist_free(root_node1);
+    res = compare_plist(root_node1, root_node2);
-        plist_free(root_node2);
-        free(plist_1);
+    plist_free(root_node1);
-        free(plist_2);
+    plist_free(root_node2);
-        free(filestats1);
-        free(filestats2);
+    free(plist_1);
+    free(plist_2);
-        return !res;
+    free(filestats1);
+    free(filestats2);
+    return !res;
 }
- 
diff --git a/test/plist_test.c b/test/plist_test.c
index 069701e..a0344e9 100644
--- a/test/plist_test.c
+++ b/test/plist_test.c
@@ -8,15 +8,15 @@
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
@@ -34,95 +34,103 @@
 int main(int argc, char *argv[])
 {
-        FILE *iplist = NULL;
+    FILE *iplist = NULL;
-        FILE *oplist = NULL;
+    FILE *oplist = NULL;
-        plist_t root_node1 = NULL;
+    plist_t root_node1 = NULL;
-        plist_t root_node2 = NULL;
+    plist_t root_node2 = NULL;
-        char *plist_xml = NULL;
+    char *plist_xml = NULL;
-        char *plist_xml2 = NULL;
+    char *plist_xml2 = NULL;
-        char *plist_bin = NULL;
+    char *plist_bin = NULL;
-        int size_in = 0;
+    int size_in = 0;
-        int size_out = 0;
+    int size_out = 0;
-        int size_out2 = 0;
+    int size_out2 = 0;
-        char *file_in = NULL;
+    char *file_in = NULL;
-        struct stat *filestats = (struct stat *) malloc(sizeof(struct stat));
+    struct stat *filestats = (struct stat *) malloc(sizeof(struct stat));
-        if (argc!= 2) {
+    if (argc!= 2)
-                printf("Wrong input\n");
+    {
-                return 1;
+        printf("Wrong input\n");
-        }
+        return 1;
+    }
-        file_in = argv[1];
-        //read input file
+    file_in = argv[1];
-        iplist = fopen(file_in, "rb");
+    //read input file
+    iplist = fopen(file_in, "rb");
-        if (!iplist) {
-                printf("File does not exists\n");
+    if (!iplist)
-                return 2;
+    {
-        }
+        printf("File does not exists\n");
-        printf("File %s is open\n", file_in);
+        return 2;
-        stat(file_in, filestats);
+    }
-        size_in = filestats->st_size;
+    printf("File %s is open\n", file_in);
-        plist_xml = (char *) malloc(sizeof(char) * (size_in + 1));
+    stat(file_in, filestats);
-        fread(plist_xml, sizeof(char), size_in, iplist);
+    size_in = filestats->st_size;
-        fclose(iplist);
+    plist_xml = (char *) malloc(sizeof(char) * (size_in + 1));
+    fread(plist_xml, sizeof(char), size_in, iplist);
+    fclose(iplist);
-        //convert one format to another
-        plist_from_xml(plist_xml, size_in, &root_node1);
-        if (!root_node1) {
+    //convert one format to another
-                printf("PList XML parsing failed\n");
+    plist_from_xml(plist_xml, size_in, &root_node1);
-                return 3;
+    if (!root_node1)
-        }
+    {
-        else
+        printf("PList XML parsing failed\n");
-                printf("PList XML parsing succeeded\n");
+        return 3;
+    }
-        plist_to_bin(root_node1, &plist_bin, &size_out);
+    else
-        if (!plist_bin) {
+        printf("PList XML parsing succeeded\n");
-                printf("PList BIN writing failed\n");
-                return 4;
+    plist_to_bin(root_node1, &plist_bin, &size_out);
-        }
+    if (!plist_bin)
-        else
+    {
-                printf("PList BIN writing succeeded\n");
+        printf("PList BIN writing failed\n");
+        return 4;
-        plist_from_bin(plist_bin, size_out, &root_node2);
+    }
-        if (!root_node2) {
+    else
-                printf("PList BIN parsing failed\n");
+        printf("PList BIN writing succeeded\n");
-                return 5;
-        }
+    plist_from_bin(plist_bin, size_out, &root_node2);
-        else
+    if (!root_node2)
-                printf("PList BIN parsing succeeded\n");
+    {
+        printf("PList BIN parsing failed\n");
-        plist_to_xml(root_node2, &plist_xml2, &size_out2);
+        return 5;
-        if (!plist_xml2) {
+    }
-                printf("PList XML writing failed\n");
+    else
-                return 8;
+        printf("PList BIN parsing succeeded\n");
-        }
-        else
+    plist_to_xml(root_node2, &plist_xml2, &size_out2);
-                printf("PList XML writing succeeded\n");
+    if (!plist_xml2)
+    {
-        if (plist_xml2) {
+        printf("PList XML writing failed\n");
-                FILE *oplist = NULL;
+        return 8;
-                char file_out[512];
+    }
-                sprintf(file_out, "%s.out", file_in);
+    else
-                oplist = fopen(file_out, "wb");
+        printf("PList XML writing succeeded\n");
-                fwrite(plist_xml2, size_out2, sizeof(char), oplist);
-                fclose(oplist);
+    if (plist_xml2)
-        }
+    {
+        FILE *oplist = NULL;
-        plist_free(root_node1);
+        char file_out[512];
-        plist_free(root_node2);
+        sprintf(file_out, "%s.out", file_in);
-        free(plist_bin);
+        oplist = fopen(file_out, "wb");
-        free(plist_xml);
+        fwrite(plist_xml2, size_out2, sizeof(char), oplist);
-        free(plist_xml2);
+        fclose(oplist);
-        free(filestats);
+    }
-        if (size_in != size_out2) {
+    plist_free(root_node1);
-                printf("Size of input and output is different\n");
+    plist_free(root_node2);
-                printf("Input size : %i\n", size_in);
+    free(plist_bin);
-                printf("Output size : %i\n", size_out2);
+    free(plist_xml);
-        }
+    free(plist_xml2);
+    free(filestats);
-        //success
-        return 0;
+    if (size_in != size_out2)
+    {
+        printf("Size of input and output is different\n");
+        printf("Input size : %i\n", size_in);
+        printf("Output size : %i\n", size_out2);
+    }
+    //success
+    return 0;
 }
-