[asterisk-commits] tilghman: trunk r302686 - in /trunk: ./ include/asterisk/astdb.h

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Jan 19 15:24:25 2011
New Revision: 302686

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302686
Log:
Merged revisions 302680 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302680 | tilghman | 2011-01-19 15:23:31 -0600 (Wed, 19 Jan 2011) | 16 lines
  
  Merged revisions 302675 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r302675 | tilghman | 2011-01-19 15:22:45 -0600 (Wed, 19 Jan 2011) | 9 lines
    
    Merged revisions 302663 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r302663 | tilghman | 2011-01-19 15:20:28 -0600 (Wed, 19 Jan 2011) | 2 lines
      
      Add some API documentation
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/astdb.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/include/asterisk/astdb.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/astdb.h?view=diff&rev=302686&r1=302685&r2=302686
==============================================================================
--- trunk/include/asterisk/astdb.h (original)
+++ trunk/include/asterisk/astdb.h Wed Jan 19 15:24:25 2011
@@ -33,22 +33,37 @@
 	char data[0];
 };
 
-/*! \brief Get key value specified by family/key */
+/*!\brief Get key value specified by family/key */
 int ast_db_get(const char *family, const char *key, char *out, int outlen);
 
-/*! \brief Store value addressed by family/key*/
+/*!\brief Store value addressed by family/key */
 int ast_db_put(const char *family, const char *key, const char *value);
 
-/*! \brief Delete entry in astdb */
+/*!\brief Delete entry in astdb */
 int ast_db_del(const char *family, const char *key);
 
-/*! \brief Delete a whole family (for some reason also called "tree" */
+/*!\brief Delete one or more entries in astdb
+ * If both parameters are NULL, the entire database will be purged.  If
+ * only keytree is NULL, all entries within the family will be purged.
+ * It is an error for keytree to have a value when family is NULL.
+ *
+ * \retval 0 Entries were deleted
+ * \retval -1 An error occurred
+ */
 int ast_db_deltree(const char *family, const char *keytree);
 
-/*! \brief Get a whole family */
+/*!\brief Get a list of values within the astdb tree
+ * If family is specified, only those keys will be returned.  If keytree
+ * is specified, subkeys are expected to exist (separated from the key with
+ * a slash).  If subkeys do not exist and keytree is specified, the tree will
+ * consist of either a single entry or NULL will be returned.
+ *
+ * Resulting tree should be freed by passing the return value to ast_db_freetree()
+ * when usage is concluded.
+ */
 struct ast_db_entry *ast_db_gettree(const char *family, const char *keytree);
 
-/*! \brief Free in-memory data */
+/*!\brief Free structure created by ast_db_gettree() */
 void ast_db_freetree(struct ast_db_entry *entry);
 
 #if defined(__cplusplus) || defined(c_plusplus)