diff options
| author | Richard Trieu <rtrieu@google.com> | 2016-02-18 22:34:54 +0000 |
|---|---|---|
| committer | Richard Trieu <rtrieu@google.com> | 2016-02-18 22:34:54 +0000 |
| commit | cc3949d99af2b2ea2f31c1694eeef7cea0f484f0 (patch) | |
| tree | 7b6a787cb2352bf0f9ced314eaff8aad71618459 /clang/lib/Analysis | |
| parent | 7a08381403b54cd8998f3c922f18b65867e3c07c (diff) | |
| download | bcm5719-llvm-cc3949d99af2b2ea2f31c1694eeef7cea0f484f0.tar.gz bcm5719-llvm-cc3949d99af2b2ea2f31c1694eeef7cea0f484f0.zip | |
Remove use of builtin comma operator.
Cleanup for upcoming Clang warning -Wcomma. No functionality change intended.
llvm-svn: 261271
Diffstat (limited to 'clang/lib/Analysis')
| -rw-r--r-- | clang/lib/Analysis/FormatString.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/clang/lib/Analysis/FormatString.cpp b/clang/lib/Analysis/FormatString.cpp index 0948bc0b08a..1c42ec0e87c 100644 --- a/clang/lib/Analysis/FormatString.cpp +++ b/clang/lib/Analysis/FormatString.cpp @@ -190,13 +190,21 @@ clang::analyze_format_string::ParseLengthModifier(FormatSpecifier &FS, return false; case 'h': ++I; - lmKind = (I != E && *I == 'h') ? (++I, LengthModifier::AsChar) - : LengthModifier::AsShort; + if (I != E && *I == 'h') { + ++I; + lmKind = LengthModifier::AsChar; + } else { + lmKind = LengthModifier::AsShort; + } break; case 'l': ++I; - lmKind = (I != E && *I == 'l') ? (++I, LengthModifier::AsLongLong) - : LengthModifier::AsLong; + if (I != E && *I == 'l') { + ++I; + lmKind = LengthModifier::AsLongLong; + } else { + lmKind = LengthModifier::AsLong; + } break; case 'j': lmKind = LengthModifier::AsIntMax; ++I; break; case 'z': lmKind = LengthModifier::AsSizeT; ++I; break; |
