From: Howard Chu <hyc@symas.com>
Date: Sun, 18 Sep 2011 20:28:08 +0000 (-0700)
Subject: Fix typo, minor cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_4_27~148^2~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=77b1017b85338bfd54de9052e431a44b68119e14;p=openldap

Fix typo, minor cleanup
---

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index a6df703c37..aa5f2cd3c6 100644
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -1163,7 +1163,7 @@ mdb_env_sync(MDB_env *env, int force)
 	return rc;
 }
 
-static inline void
+static void
 mdb_txn_reset0(MDB_txn *txn);
 
 /** 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
  * reader table is full.
  */
-static inline int
+static int
 mdb_txn_renew0(MDB_txn *txn)
 {
 	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().
  * @param[in] txn the transaction handle to reset
  */
-static inline void
+static void
 mdb_txn_reset0(MDB_txn *txn)
 {
 	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
  * 	 hval arg on the first call.
  */
-static inline mdb_hash_t
+static mdb_hash_t
 mdb_hash_str(char *str, mdb_hash_t hval)
 {
 	unsigned char *s = (unsigned char *)str;	/* unsigned string */
diff --git a/libraries/libmdb/midl.c b/libraries/libmdb/midl.c
index 70487aa3d9..2f882adbe8 100644
--- a/libraries/libmdb/midl.c
+++ b/libraries/libmdb/midl.c
@@ -167,7 +167,7 @@ int mdb_midl_append( IDL *idp, ID id )
 #define	SWAP(a,b)	{ itmp=(a); (a)=(b); (b)=itmp; }
 
 void
-mdb_midl_sort( ID *ids )
+mdb_midl_sort( IDL ids )
 {
 	/* Max possible depth of int-indexed tree * 2 items/level */
 	int istack[sizeof(int)*CHAR_BIT * 2];
diff --git a/libraries/libmdb/midl.h b/libraries/libmdb/midl.h
index 0ab89e0333..f3fb3a093e 100644
--- a/libraries/libmdb/midl.h
+++ b/libraries/libmdb/midl.h
@@ -132,7 +132,7 @@ int mdb_midl_shrink(IDL *idp);
 	/** Append an ID onto an IDL.
 	 * @param[in,out] idp	Address of the IDL to append to.
 	 * @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 );