summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2009-04-01 20:13:28 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2009-04-01 20:13:28 +0000
commitbe40f3a33c5a04fb97e77885cfc4844b448ebf9f (patch)
treec35dddff18f8ba221a68bfa833fa66aa2f3124d9 /res
parent729f22522558310b9a01413a1be8a35b4f3cb7f5 (diff)
Merge changes from str_substitution that are unrelated to that branch.
Included is a small bugfix to an ast_str helper, but most of these changes are simply doxygen fixes. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@185912 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_odbc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 85de1fa87..19280d49e 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -415,11 +415,12 @@ static void destroy_table_cache(struct odbc_cache_tables *table) {
/*!
* \brief Find or create an entry describing the table specified.
- * \param obj An active ODBC handle on which to query the table
- * \param table Tablename to describe
+ * \param database Name of an ODBC class on which to query the table
+ * \param tablename Tablename to describe
* \retval A structure describing the table layout, or NULL, if the table is not found or another error occurs.
* When a structure is returned, the contained columns list will be
* rdlock'ed, to ensure that it will be retained in memory.
+ * \since 1.6.1
*/
struct odbc_cache_tables *ast_odbc_find_table(const char *database, const char *tablename)
{