API change: mdb_drop() only accepts del=0 or 1.

This allows for other flag values in the future.
vmware
Hallvard Furuseth 12 years ago
parent d903bed218
commit 7e620a34a2
  1. 2
      libraries/libmdb/mdb.c
  2. 6
      libraries/libmdb/mdb.h

@ -6904,7 +6904,7 @@ int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del)
MDB_cursor *mc; MDB_cursor *mc;
int rc; int rc;
if (!txn || !dbi || dbi >= txn->mt_numdbs) if (!txn || !dbi || dbi >= txn->mt_numdbs || (unsigned)del > 1)
return EINVAL; return EINVAL;
if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY)) if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY))

@ -792,12 +792,12 @@ void mdb_close(MDB_env *env, MDB_dbi dbi);
/** @brief Delete a database and/or free all its pages. /** @brief Delete a database and/or free all its pages.
* *
* If the \b del parameter is non-zero the DB handle will be closed * If the \b del parameter is 1, the DB handle will be closed
* and the DB will be deleted. * and the DB will be deleted.
* @param[in] txn A transaction handle returned by #mdb_txn_begin() * @param[in] txn A transaction handle returned by #mdb_txn_begin()
* @param[in] dbi A database handle returned by #mdb_open() * @param[in] dbi A database handle returned by #mdb_open()
* @param[in] del non-zero to delete the DB from the environment, * @param[in] del 1 to delete the DB from the environment,
* otherwise just free its pages. * 0 to just free its pages.
* @return A non-zero error value on failure and 0 on success. * @return A non-zero error value on failure and 0 on success.
*/ */
int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del); int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del);

Loading…
Cancel
Save