[svn-commits] bbryant: branch group/data_api_gsoc2009 r201101 - in /team/group/data_api_gso...

[SVN commits to the Digium repositories]

Author: bbryant
Date: Tue Jun 16 15:06:36 2009
New Revision: 201101

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201101
Log:
A few simplifications to the tree structure.

Modified:
    team/group/data_api_gsoc2009/include/asterisk/data.h
    team/group/data_api_gsoc2009/main/data.c

Modified: team/group/data_api_gsoc2009/include/asterisk/data.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/data_api_gsoc2009/include/asterisk/data.h?view=diff&rev=201101&r1=201100&r2=201101
==============================================================================
--- team/group/data_api_gsoc2009/include/asterisk/data.h (original)
+++ team/group/data_api_gsoc2009/include/asterisk/data.h Tue Jun 16 15:06:36 2009
@@ -74,6 +74,16 @@
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
+
+/*! \brief The data type of the data node. */
+enum ast_data_element_t {
+	INTEGER,
+	UNSIGNED_INTEGER,
+	DOUBLE,
+	STRING,
+	IPADDR,
+	POINTER
+};
 
 /*! \brief opaque definition of an ast_data handler, a tree node. */
 struct ast_data;

Modified: team/group/data_api_gsoc2009/main/data.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/data_api_gsoc2009/main/data.c?view=diff&rev=201101&r1=201100&r2=201101
==============================================================================
--- team/group/data_api_gsoc2009/main/data.c (original)
+++ team/group/data_api_gsoc2009/main/data.c Tue Jun 16 15:06:36 2009
@@ -36,24 +36,9 @@
 /*! \brief The data tree to be returned by the callbacks and 
            managed by functions local to this file. */
 struct ast_data {
-	struct ao2_container *children;
-};
-
-/*! \brief The data type of the data node. */
-enum ast_data_element_t {
-	INTEGER,
-	UNSIGNED_INTEGER,
-	DOUBLE,
-	STRING,
-	IPADDR,
-	POINTER
-};
-
-/*! \brief The structure of a node in an ast_data tree used 
-           throughout the callbacks*/
-struct ast_data_element {
 	enum ast_data_element_t type;
 	char *name;
+	struct ao2_container *children;
 	char data[0];
 };