summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2008-11-21 04:05:08 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2008-11-21 04:05:08 +0000
commite12819aeacd2547daf41100b67a0e0de676105c3 (patch)
tree6e503791434d243d8ff1900d94dc61a722694178 /include
parentd5ff454bdaa5c6d032c376b036f455db4215a2ec (diff)
downloadlibapr-util-e12819aeacd2547daf41100b67a0e0de676105c3.tar.gz
replace missing comment
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@719467 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-rw-r--r--include/apr_dbm.h13
-rw-r--r--include/apu.hw3
-rw-r--r--include/private/apr_dbm_private.h6
3 files changed, 11 insertions, 11 deletions
diff --git a/include/apr_dbm.h b/include/apr_dbm.h
index 9f6e8b47..ad1b4f39 100644
--- a/include/apr_dbm.h
+++ b/include/apr_dbm.h
@@ -63,10 +63,10 @@ typedef struct
* @param dbm The newly opened database
* @param type The type of the DBM (not all may be available at run time)
* <pre>
- * GDBM for GDBM files
- * SDBM for SDBM files
- * DB for berkeley DB files
- * NDBM for NDBM files
+ * db for Berkeley DB files
+ * gdbm for GDBM files
+ * ndbm for NDBM files
+ * sdbm for SDBM files (always available)
* default for the default DBM type
* </pre>
* @param name The dbm file name to open
@@ -81,6 +81,9 @@ typedef struct
* @param cntxt The pool to use when creating the dbm
* @remark The dbm name may not be a true file name, as many dbm packages
* append suffixes for seperate data and index files.
+ * @bug In apr-util 0.9 and 1.x, the type arg was case insensitive. This
+ * was highly inefficient, and as of 2.x the dbm name must be provided in
+ * the correct case (lower case for all bundled providers)
*/
APU_DECLARE(apr_status_t) apr_dbm_open_ex(apr_dbm_t **dbm, const char* type,
@@ -184,7 +187,7 @@ APU_DECLARE(char *) apr_dbm_geterror(apr_dbm_t *dbm, int *errcode,
* actual file/path names which would be (created and) used. At most, two
* files may be used; used2 may be NULL if only one file is used.
* @param pool The pool for allocating used1 and used2.
- * @param type The type of DBM you require info on
+ * @param type The type of DBM you require info on @see apr_dbm_open_ex
* @param pathname The path name to generate used-names from.
* @param used1 The first pathname used by the apr_dbm implementation.
* @param used2 The second pathname used by apr_dbm. If only one file is
diff --git a/include/apu.hw b/include/apu.hw
index b0b0b3ca..cdc3fb8a 100644
--- a/include/apu.hw
+++ b/include/apu.hw
@@ -108,14 +108,13 @@
#define APU_HAVE_DB_VERSION 0
#endif
-#ifndef APU_DBD_DSO_BUILD
#define APU_HAVE_PGSQL 0
#define APU_HAVE_MYSQL 0
#define APU_HAVE_SQLITE3 0
#define APU_HAVE_SQLITE2 0
#define APU_HAVE_ORACLE 0
#define APU_HAVE_FREETDS 0
-#endif
+
/* Windows always has ODBC */
#define APU_HAVE_ODBC 1
diff --git a/include/private/apr_dbm_private.h b/include/private/apr_dbm_private.h
index c598752f..f92cce77 100644
--- a/include/private/apr_dbm_private.h
+++ b/include/private/apr_dbm_private.h
@@ -110,13 +110,11 @@ struct apr_dbm_t
/* Declare all of the builtin DBM providers */
APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_sdbm;
+#ifndef DSO_BUILD
APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_gdbm;
APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_ndbm;
-APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db1;
-APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db2;
-APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db3;
-APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db4;
APU_DECLARE_DATA extern const apr_dbm_type_t apr_dbm_type_db;
+#endif
#ifdef __cplusplus
}