diff options
| author | Dmitri Gribenko <gribozavr@gmail.com> | 2014-06-16 11:22:33 +0000 |
|---|---|---|
| committer | Dmitri Gribenko <gribozavr@gmail.com> | 2014-06-16 11:22:33 +0000 |
| commit | caee8cbd57610e82fd844aa60cbe1e6a4c5e33cd (patch) | |
| tree | eff4d3c57310e88236e9003c873604944900d644 /llvm/lib | |
| parent | 1089db0ee6383aacb3f8f78896de43703b658760 (diff) | |
| download | bcm5719-llvm-caee8cbd57610e82fd844aa60cbe1e6a4c5e33cd.tar.gz bcm5719-llvm-caee8cbd57610e82fd844aa60cbe1e6a4c5e33cd.zip | |
Support/ConvertUTF: restore compatibility with MSVC, which only implements C89
llvm-svn: 211016
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Support/ConvertUTF.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/llvm/lib/Support/ConvertUTF.c b/llvm/lib/Support/ConvertUTF.c index 62a99a8bf17..128459a1d54 100644 --- a/llvm/lib/Support/ConvertUTF.c +++ b/llvm/lib/Support/ConvertUTF.c @@ -396,6 +396,8 @@ Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) { static unsigned findMaximalSubpartOfIllFormedUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) { + UTF8 b1, b2, b3; + assert(!isLegalUTF8Sequence(source, sourceEnd)); /* @@ -415,7 +417,7 @@ findMaximalSubpartOfIllFormedUTF8Sequence(const UTF8 *source, * Byte Sequences. */ - UTF8 b1 = *source; + b1 = *source; ++source; if (b1 >= 0xC2 && b1 <= 0xDF) { /* @@ -428,7 +430,7 @@ findMaximalSubpartOfIllFormedUTF8Sequence(const UTF8 *source, if (source == sourceEnd) return 1; - UTF8 b2 = *source; + b2 = *source; ++source; if (b1 == 0xE0) { @@ -448,7 +450,7 @@ findMaximalSubpartOfIllFormedUTF8Sequence(const UTF8 *source, if (source == sourceEnd) return 2; - UTF8 b3 = *source; + b3 = *source; return (b3 >= 0x80 && b3 <= 0xBF) ? 3 : 2; } return 1; @@ -458,7 +460,7 @@ findMaximalSubpartOfIllFormedUTF8Sequence(const UTF8 *source, if (source == sourceEnd) return 2; - UTF8 b3 = *source; + b3 = *source; return (b3 >= 0x80 && b3 <= 0xBF) ? 3 : 2; } return 1; @@ -468,7 +470,7 @@ findMaximalSubpartOfIllFormedUTF8Sequence(const UTF8 *source, if (source == sourceEnd) return 2; - UTF8 b3 = *source; + b3 = *source; return (b3 >= 0x80 && b3 <= 0xBF) ? 3 : 2; } return 1; |
