diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-07-18 11:12:59 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-07-18 01:45:12 +0000 |
| commit | e1ed094bd449e59d3dcb3c83c2e05af3da08830c (patch) | |
| tree | bbcd57003c81706627b4c90efda59a1453ffdb13 | |
| parent | 4e55569e7d57646a160cd472783db5e5c3054756 (diff) | |
| download | mongo-e1ed094bd449e59d3dcb3c83c2e05af3da08830c.tar.gz | |
Import wiredtiger: 39a851a26aaeba41594fe6725f028b81fddc2f0a from branch mongodb-master
ref: f0973921f6..39a851a26a
for: 6.1.0-rc0
WT-9573 Ignore "explicit declaration of ret" false positive in s_style (#8125)
| -rwxr-xr-x | src/third_party/wiredtiger/dist/s_style | 4 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/dist/s_style b/src/third_party/wiredtiger/dist/s_style index c3e53320c62..ceffe75308c 100755 --- a/src/third_party/wiredtiger/dist/s_style +++ b/src/third_party/wiredtiger/dist/s_style @@ -208,7 +208,9 @@ else ! expr "$f" : 'examples/.*' > /dev/null && ! expr "$f" : 'test/.*' > /dev/null && ! expr "$f" : 'ext/.*' > /dev/null; then - egrep -w ret $f | egrep 'int.*[, ]ret[,;]' > $t + # This regex can return false positives on functions that take ret as + # an argument. Filter out matches that contain brackets. + egrep -w ret $f | egrep 'int.*[, ]ret[,;]' | egrep -v '[()]' > $t test -s $t && { echo "$f: explicit declaration of \"ret\"" cat $t diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index aaacbb9534c..823e6df598f 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "f0973921f60c967f65ec74aa063aef51fc148de0" + "commit": "39a851a26aaeba41594fe6725f028b81fddc2f0a" } |