diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 14:59:55 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 14:59:55 -0700 |
| commit | 7cc97521db1e52d5927f5605de5f9a7102f8af40 (patch) | |
| tree | df96cf98cd470e794c7817f347511f3c554c96e4 /core/src/fxcrt/fx_basic_wstring.cpp | |
| parent | b05f1fd710496dea44b001bb905fa1c16a39bb28 (diff) | |
| download | pdfium-7cc97521db1e52d5927f5605de5f9a7102f8af40.tar.xz | |
Fix else-after-returns throughout pdfium.
Driven by CS search for
pcre:yes file:third_party/pdfium/ -file:pdfium/third_party/
\breturn\b[^;]*;\s*\n*\s*\}*\s*\n*\r*else
Note: Care is required to ensure the preceding block is not an else-if.
As usual, removed any tabs I saw.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1243883003 .
Diffstat (limited to 'core/src/fxcrt/fx_basic_wstring.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 2442daed27..b6b595588d 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -485,7 +485,8 @@ int CFX_WideString::Compare(const CFX_WideString& str) const return 0; } return -1; - } else if (str.m_pData == NULL) { + } + if (str.m_pData == NULL) { return 1; } int this_len = m_pData->m_nDataLength; @@ -494,13 +495,15 @@ int CFX_WideString::Compare(const CFX_WideString& str) const for (int i = 0; i < min_len; i ++) { if (m_pData->m_String[i] < str.m_pData->m_String[i]) { return -1; - } else if (m_pData->m_String[i] > str.m_pData->m_String[i]) { + } + if (m_pData->m_String[i] > str.m_pData->m_String[i]) { return 1; } } if (this_len < that_len) { return -1; - } else if (this_len > that_len) { + } + if (this_len > that_len) { return 1; } return 0; |