Fix typo, minor cleanup

vmware
Howard Chu 13 years ago
parent 57b5fbea49
commit 77b1017b85
  1. 8
      libraries/libmdb/mdb.c
  2. 2
      libraries/libmdb/midl.c
  3. 2
      libraries/libmdb/midl.h

@ -1163,7 +1163,7 @@ mdb_env_sync(MDB_env *env, int force)
return rc; return rc;
} }
static inline void static void
mdb_txn_reset0(MDB_txn *txn); mdb_txn_reset0(MDB_txn *txn);
/** Common code for #mdb_txn_begin() and #mdb_txn_renew(). /** Common code for #mdb_txn_begin() and #mdb_txn_renew().
@ -1172,7 +1172,7 @@ mdb_txn_reset0(MDB_txn *txn);
* fail for read-only transactions, and then only if the * fail for read-only transactions, and then only if the
* reader table is full. * reader table is full.
*/ */
static inline int static int
mdb_txn_renew0(MDB_txn *txn) mdb_txn_renew0(MDB_txn *txn)
{ {
MDB_env *env = txn->mt_env; MDB_env *env = txn->mt_env;
@ -1301,7 +1301,7 @@ mdb_txn_begin(MDB_env *env, unsigned int flags, MDB_txn **ret)
/** Common code for #mdb_txn_reset() and #mdb_txn_abort(). /** Common code for #mdb_txn_reset() and #mdb_txn_abort().
* @param[in] txn the transaction handle to reset * @param[in] txn the transaction handle to reset
*/ */
static inline void static void
mdb_txn_reset0(MDB_txn *txn) mdb_txn_reset0(MDB_txn *txn)
{ {
MDB_env *env = txn->mt_env; MDB_env *env = txn->mt_env;
@ -2107,7 +2107,7 @@ typedef unsigned long long mdb_hash_t;
* NOTE: To use the recommended 64 bit FNV-1a hash, use MDB_HASH_INIT as the * NOTE: To use the recommended 64 bit FNV-1a hash, use MDB_HASH_INIT as the
* hval arg on the first call. * hval arg on the first call.
*/ */
static inline mdb_hash_t static mdb_hash_t
mdb_hash_str(char *str, mdb_hash_t hval) mdb_hash_str(char *str, mdb_hash_t hval)
{ {
unsigned char *s = (unsigned char *)str; /* unsigned string */ unsigned char *s = (unsigned char *)str; /* unsigned string */

@ -167,7 +167,7 @@ int mdb_midl_append( IDL *idp, ID id )
#define SWAP(a,b) { itmp=(a); (a)=(b); (b)=itmp; } #define SWAP(a,b) { itmp=(a); (a)=(b); (b)=itmp; }
void void
mdb_midl_sort( ID *ids ) mdb_midl_sort( IDL ids )
{ {
/* Max possible depth of int-indexed tree * 2 items/level */ /* Max possible depth of int-indexed tree * 2 items/level */
int istack[sizeof(int)*CHAR_BIT * 2]; int istack[sizeof(int)*CHAR_BIT * 2];

@ -132,7 +132,7 @@ int mdb_midl_shrink(IDL *idp);
/** Append an ID onto an IDL. /** Append an ID onto an IDL.
* @param[in,out] idp Address of the IDL to append to. * @param[in,out] idp Address of the IDL to append to.
* @param[in] id The ID to append. * @param[in] id The ID to append.
* @return 0 on success, -2 if the IDL is too large. * @return 0 on success, -1 if the IDL is too large.
*/ */
int mdb_midl_append( IDL *idp, ID id ); int mdb_midl_append( IDL *idp, ID id );

Loading…
Cancel
Save