diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-01 22:44:34 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-01 22:44:34 +0000 |
| commit | 85a2885d4d8b0682d75f63ec7642c91509bc92bc (patch) | |
| tree | 54be8ef17eee6eca550e1c721f215084edc0c53e /res | |
| parent | 499ccb7760af9f6c38d1729d0580faaa1f0252ca (diff) | |
Merged revisions 185912 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r185912 | tilghman | 2009-04-01 15:13:28 -0500 (Wed, 01 Apr 2009) | 4 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@185947 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_odbc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c index ec883abf4..0b9c60c79 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) { |