diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2019-10-15 00:55:34 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-10-15 00:55:34 +0000 |
| commit | d819272026fd1c21b9fb18ae692648cfa590aa68 (patch) | |
| tree | e2a59514b2c5f84f76b7aec09b2ec850d0f753dc /src/third_party/wiredtiger/src/config | |
| parent | ac0b3c4052e88c6626b4bd3129d4190e2d0aa179 (diff) | |
| download | mongo-d819272026fd1c21b9fb18ae692648cfa590aa68.tar.gz | |
Import wiredtiger: af2cb8f052184a94635c3bfc358620dd36df5828 from branch mongodb-4.4
ref: 3818fb14bd..af2cb8f052
for: 4.3.1
WT-4972 Add new RHEL Evergreen build variant
WT-4975 Migrate Jenkins “wiredtiger-pull-request-asan” job to Evergreen
WT-5123 Fill multi-paragraph comments
WT-5150 LAS sweep is not removing the entries that are no longer required
WT-5161 Remove deprecated git.apply_patch
WT-5163 Fix ignored failure return in WT_CURSOR.next when random retrieval configured
WT-5164 Fix inconsistent underscore/dash output
WT-5166 Allow configuring configure flags in evergreen builds
Diffstat (limited to 'src/third_party/wiredtiger/src/config')
| -rw-r--r-- | src/third_party/wiredtiger/src/config/config_api.c | 6 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/config/config_collapse.c | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/third_party/wiredtiger/src/config/config_api.c b/src/third_party/wiredtiger/src/config/config_api.c index e489e932247..a50754a59a6 100644 --- a/src/third_party/wiredtiger/src/config/config_api.c +++ b/src/third_party/wiredtiger/src/config/config_api.c @@ -160,8 +160,7 @@ __conn_foc_add(WT_SESSION_IMPL *session, const void *p) conn = S2C(session); /* - * Callers of this function are expected to be holding the connection's - * api_lock. + * Callers of this function are expected to be holding the connection's api_lock. * * All callers of this function currently ignore errors. */ @@ -255,8 +254,7 @@ __wt_configure_method(WT_SESSION_IMPL *session, const char *method, const char * /* * Allocate new configuration entry and fill it in. * - * The new base value is the previous base value, a separator and the - * new configuration string. + * The new base value is the previous base value, a separator and the new configuration string. */ WT_ERR(__wt_calloc_one(session, &entry)); entry->method = (*epp)->method; diff --git a/src/third_party/wiredtiger/src/config/config_collapse.c b/src/third_party/wiredtiger/src/config/config_collapse.c index 292f3fcbe4a..e1bdc202b2b 100644 --- a/src/third_party/wiredtiger/src/config/config_collapse.c +++ b/src/third_party/wiredtiger/src/config/config_collapse.c @@ -56,9 +56,8 @@ __wt_config_collapse(WT_SESSION_IMPL *session, const char **cfg, char **config_r goto err; /* - * If the caller passes us no valid configuration strings, we get here - * with no bytes to copy -- that's OK, the underlying string copy can - * handle empty strings. + * If the caller passes us no valid configuration strings, we get here with no bytes to copy -- + * that's OK, the underlying string copy can handle empty strings. * * Strip any trailing comma. */ @@ -145,9 +144,8 @@ keep: goto err; /* - * If the caller passes us only default configuration strings, we get - * here with no bytes to copy -- that's OK, the underlying string copy - * can handle empty strings. + * If the caller passes us only default configuration strings, we get here with no bytes to copy + * -- that's OK, the underlying string copy can handle empty strings. * * Strip any trailing comma. */ |