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

Warning cleanup: printf(%p, struct*)

Browse Source
vmware
Hallvard B Furuseth 14 years ago
parent 5fdbc54d76
commit 7c1e5e9540
1 changed files with 9 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. 16
      libraries/libmdb/mdb.c

16
libraries/libmdb/mdb.c
Unescape View File

@ -498,7 +498,8 @@ mdb_txn_begin(MDB_env *env, int rdonly, MDB_txn **ret)
txn->mt_next_pgno = env->me_meta.mm_last_pg+1; txn->mt_next_pgno = env->me_meta.mm_last_pg+1;
txn->mt_first_pgno = txn->mt_next_pgno; txn->mt_first_pgno = txn->mt_next_pgno;
txn->mt_root = env->me_meta.mm_root; txn->mt_root = env->me_meta.mm_root;
DPRINTF("begin transaction %lu on mdbenv %p, root page %lu", txn->mt_txnid, env, txn->mt_root); DPRINTF("begin transaction %lu on mdbenv %p, root page %lu",
txn->mt_txnid, (void *) env, txn->mt_root);
*ret = txn; *ret = txn;
return MDB_SUCCESS; return MDB_SUCCESS;
@ -514,7 +515,8 @@ mdb_txn_abort(MDB_txn *txn)
return; return;
env = txn->mt_env; env = txn->mt_env;
DPRINTF("abort transaction %lu on mdbenv %p, root page %lu", txn->mt_txnid, env, txn->mt_root); DPRINTF("abort transaction %lu on mdbenv %p, root page %lu",
txn->mt_txnid, (void *) env, txn->mt_root);
if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY)) { if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY)) {
txn->mt_u.reader->mr_txnid = 0; txn->mt_u.reader->mr_txnid = 0;
@ -581,7 +583,7 @@ mdb_txn_commit(MDB_txn *txn)
goto done; goto done;
DPRINTF("committing transaction %lu on mdbenv %p, root page %lu", DPRINTF("committing transaction %lu on mdbenv %p, root page %lu",
txn->mt_txnid, env, txn->mt_root); txn->mt_txnid, (void *) env, txn->mt_root);
/* Commit up to MDB_COMMIT_PAGES dirty pages to disk until done. /* Commit up to MDB_COMMIT_PAGES dirty pages to disk until done.
*/ */
@ -1008,7 +1010,7 @@ mdbenv_open(MDB_env *env, const char *path, unsigned int flags, mode_t mode)
env->me_fd = -1; env->me_fd = -1;
} else { } else {
env->me_path = strdup(path); env->me_path = strdup(path);
DPRINTF("opened dbenv %p", env); DPRINTF("opened dbenv %p", (void *) env);
} }
pthread_key_create(&env->me_txkey, mdbenv_reader_dest); pthread_key_create(&env->me_txkey, mdbenv_reader_dest);
@ -1112,7 +1114,7 @@ cursor_pop_page(MDB_cursor *cursor)
top = CURSOR_TOP(cursor); top = CURSOR_TOP(cursor);
CURSOR_POP(cursor); CURSOR_POP(cursor);
DPRINTF("popped page %lu off cursor %p", top->mp_page->mp_pgno, cursor); DPRINTF("popped page %lu off cursor %p", top->mp_page->mp_pgno, (void *) cursor);
free(top); free(top);
} }
@ -1122,7 +1124,7 @@ cursor_push_page(MDB_cursor *cursor, MDB_page *mp)
{ {
MDB_ppage *ppage; MDB_ppage *ppage;
DPRINTF("pushing page %lu on cursor %p", mp->mp_pgno, cursor); DPRINTF("pushing page %lu on cursor %p", mp->mp_pgno, (void *) cursor);
if ((ppage = calloc(1, sizeof(*ppage))) == NULL) if ((ppage = calloc(1, sizeof(*ppage))) == NULL)
return NULL; return NULL;
@ -1422,7 +1424,7 @@ mdb_cursor_next(MDB_cursor *cursor, MDB_val *key, MDB_val *data)
top = CURSOR_TOP(cursor); top = CURSOR_TOP(cursor);
mp = top->mp_page; mp = top->mp_page;
DPRINTF("cursor_next: top page is %lu in cursor %p", mp->mp_pgno, cursor); DPRINTF("cursor_next: top page is %lu in cursor %p", mp->mp_pgno, (void *) cursor);
if (top->mp_ki + 1 >= NUMKEYS(mp)) { if (top->mp_ki + 1 >= NUMKEYS(mp)) {
DPRINTF("=====> move to next sibling page"); DPRINTF("=====> move to next sibling page");

Write Preview
Loading…
Cancel
Save