diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2013-06-10 11:48:45 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2013-06-10 11:48:45 -0400 |
| commit | 10038d5029fe6358871befc318f4c9c6c207dd59 (patch) | |
| tree | adb7626fa089f96da62706d9399d2e59dd0ce03a | |
| parent | 18afd23b3c57657e3f10fb1768a71cb2f6e18faf (diff) | |
| download | mongo-10038d5029fe6358871befc318f4c9c6c207dd59.tar.gz | |
minor lint, cleanup the new docs.
| -rw-r--r-- | dist/s_string.ok | 3 | ||||
| -rw-r--r-- | examples/c/ex_data_source.c | 8 | ||||
| -rw-r--r-- | ext/test/memrata/memrata.c | 5 | ||||
| -rw-r--r-- | src/include/wiredtiger_ext.h | 5 |
4 files changed, 13 insertions, 8 deletions
diff --git a/dist/s_string.ok b/dist/s_string.ok index d031f64d8ae..b04a3a61efb 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -564,6 +564,7 @@ mutexes myfile mytable mytxn +namespace namespaces nbits nbsp @@ -773,6 +774,7 @@ twiredtiger twrite txn txnid +txnidp typedef uB uid @@ -822,6 +824,7 @@ workFactor wrapup writelock wrlock +ws wti wts xff diff --git a/examples/c/ex_data_source.c b/examples/c/ex_data_source.c index 6707c4105ae..58b6cf611c9 100644 --- a/examples/c/ex_data_source.c +++ b/examples/c/ex_data_source.c @@ -565,20 +565,20 @@ main(void) { WT_SESSION *session = NULL; - /*! [WT_EXTENSION_API transaction ID] */ + /*! [WT_EXTENSION transaction ID] */ uint64_t txnid; ret = wt_api->txn_id(wt_api, session, &txnid); - /*! [WT_EXTENSION_API transaction ID] */ + /*! [WT_EXTENSION transaction ID] */ } { WT_SESSION *session = NULL; uint64_t txnid = 1; int is_visible; - /*! [WT_EXTENSION_API transaction visible] */ + /*! [WT_EXTENSION transaction visible] */ is_visible = wt_api->txn_visible(wt_api, session, txnid); - /*! [WT_EXTENSION_API transaction visible] */ + /*! [WT_EXTENSION transaction visible] */ } (void)conn->close(conn, NULL); diff --git a/ext/test/memrata/memrata.c b/ext/test/memrata/memrata.c index 236d8823f1b..837a6352eac 100644 --- a/ext/test/memrata/memrata.c +++ b/ext/test/memrata/memrata.c @@ -1368,8 +1368,9 @@ kvs_session_open_cursor(WT_DATA_SOURCE *wtds, WT_SESSION *session, cursor = NULL; ds = (DATA_SOURCE *)wtds; wtext = ds->wtext; - value = NULL; + ws = NULL; locked = 0; + value = NULL; /* Allocate and initialize a cursor. */ if ((cursor = calloc(1, sizeof(CURSOR))) == NULL) @@ -1475,7 +1476,7 @@ kvs_session_open_cursor(WT_DATA_SOURCE *wtds, WT_SESSION *session, *new_cursor = (WT_CURSOR *)cursor; if (0) { -err: if (locked) +err: if (ws != NULL && locked) ETRET(unlock(wtext, session, &ws->lock)); if (cursor != NULL) { diff --git a/src/include/wiredtiger_ext.h b/src/include/wiredtiger_ext.h index b6d56fb9bae..45e99c7f350 100644 --- a/src/include/wiredtiger_ext.h +++ b/src/include/wiredtiger_ext.h @@ -296,7 +296,7 @@ struct __wt_extension_api { * * @param wt_api the extension handle * @param session the session handle - * @param [out] txnp the transaction ID + * @param [out] txnidp the transaction ID * @errors * * @snippet ex_data_source.c WT_EXTENSION transaction ID @@ -310,7 +310,8 @@ struct __wt_extension_api { * @param wt_api the extension handle * @param session the session handle * @param txnid the transaction ID - * @errors + * @returns true (non-zero) if the transaction ID is visible to the + * current transaction. * * @snippet ex_data_source.c WT_EXTENSION transaction visible */ |