NextGraph
/
lmdb
mirror of https://github.com/nextgraph-org/lmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename mdb_env_close0() -> mdb_env_close_active()

Browse Source 
Hopefully we'll remember now what goes in which function.
mdb.master3
Hallvard Furuseth 8 years ago committed by Howard Chu
parent ad7933ba0c
commit fbf35a163f
1 changed files with 7 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      libraries/liblmdb/mdb.c

14
libraries/liblmdb/mdb.c
Unescape View File

@ -1593,9 +1593,9 @@ static int mdb_env_read_header(MDB_env *env, MDB_meta *meta);
static MDB_meta *mdb_env_pick_meta(const MDB_env *env); static MDB_meta *mdb_env_pick_meta(const MDB_env *env);
static int mdb_env_write_meta(MDB_txn *txn); static int mdb_env_write_meta(MDB_txn *txn);
#ifdef MDB_USE_POSIX_MUTEX /* Drop unused excl arg */ #ifdef MDB_USE_POSIX_MUTEX /* Drop unused excl arg */
# define mdb_env_close0(env, excl) mdb_env_close1(env) # define mdb_env_close_active(env, excl) mdb_env_close1(env)
#endif #endif
static void mdb_env_close0(MDB_env *env, int excl); static void mdb_env_close_active(MDB_env *env, int excl);
static MDB_node *mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp); static MDB_node *mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp);
static int mdb_node_add(MDB_cursor *mc, indx_t indx, static int mdb_node_add(MDB_cursor *mc, indx_t indx,
@ -5397,7 +5397,7 @@ mdb_env_open(MDB_env *env, const char *path, unsigned int flags, mdb_mode_t mode
#endif #endif
} }
#endif #endif
flags |= MDB_ENV_ACTIVE; /* tell mdb_env_close0() to clean up */ flags |= MDB_ENV_ACTIVE; /* tell mdb_env_close_active() to clean up */
if (flags & MDB_RDONLY) { if (flags & MDB_RDONLY) {
/* silently ignore WRITEMAP when we're only getting read access */ /* silently ignore WRITEMAP when we're only getting read access */
@ -5504,15 +5504,15 @@ mdb_env_open(MDB_env *env, const char *path, unsigned int flags, mdb_mode_t mode
leave: leave:
if (rc) { if (rc) {
mdb_env_close0(env, excl); mdb_env_close_active(env, excl);
} }
mdb_fname_destroy(fname); mdb_fname_destroy(fname);
return rc; return rc;
} }
/** Destroy resources from mdb_env_open(), clear our readers & DBIs */ /** When #MDB_ENV_ACTIVE: Clear #mdb_env_open()ed resources, release readers */
static void ESECT static void ESECT
mdb_env_close0(MDB_env *env, int excl) mdb_env_close_active(MDB_env *env, int excl)
{ {
int i; int i;
@ -5659,7 +5659,7 @@ mdb_env_close(MDB_env *env)
free(dp); free(dp);
} }
mdb_env_close0(env, 0); mdb_env_close_active(env, 0);
free(env); free(env);
} }

Write Preview
Loading…
Cancel
Save