From 5b7c983a663ee45a3a2f7f05bbe7d294013a06d6 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 14 Sep 2011 20:30:26 -0700 Subject: [PATCH 1/2] MacOSX semaphore names are limited to 31 chars Including the terminating NUL. Good job documenting that, guys. --- libraries/libmdb/mdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c index d41a36246f..a336ab8dc2 100644 --- a/libraries/libmdb/mdb.c +++ b/libraries/libmdb/mdb.c @@ -2164,7 +2164,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl) #else /* _WIN32 */ #ifdef __APPLE__ char *ptr; - sprintf(env->me_txns->mti_rmname, "MDBr%.28s", lpath); + sprintf(env->me_txns->mti_rmname, "MDBr%.26s", lpath); ptr = env->me_txns->mti_rmname + sizeof("MDBr")-1; while ((ptr = strchr(ptr, '/'))) *ptr++ = '_'; @@ -2178,7 +2178,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl) rc = ErrCode(); goto fail; } - sprintf(env->me_txns->mti_wmname, "MDBw%.28s", lpath); + sprintf(env->me_txns->mti_wmname, "MDBw%.26s", lpath); ptr = env->me_txns->mti_wmname + sizeof("MDBw")-1; while ((ptr = strchr(ptr, '/'))) *ptr++ = '_'; From 2c033676ea481f3f84b843c09c81295d0d30a46d Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 14 Sep 2011 20:33:09 -0700 Subject: [PATCH 2/2] Doc tweak - txn flags --- libraries/libmdb/mdb.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c index a336ab8dc2..8cf7ac28b6 100644 --- a/libraries/libmdb/mdb.c +++ b/libraries/libmdb/mdb.c @@ -732,9 +732,14 @@ struct MDB_txn { */ MDB_dbi mt_numdbs; +/** @defgroup mdb_txn Transaction Flags + * @ingroup internal + * @{ + */ #define MDB_TXN_RDONLY 0x01 /**< read-only transaction */ #define MDB_TXN_ERROR 0x02 /**< an error has occurred */ - unsigned int mt_flags; +/** @} */ + unsigned int mt_flags; /**< @ref mdb_txn */ /** Tracks which of the two meta pages was used at the start * of this transaction. */