diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:04:26 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:04:26 -0700 |
| commit | 4eb4d7f6c707cc2c23c806aa540d055c8832b55d (patch) | |
| tree | 43b7a7fac7b4ce08c287bfc03d09e5e1201e20d0 /core/src/fxcrt/fx_basic_wstring.cpp | |
| parent | 7cc97521db1e52d5927f5605de5f9a7102f8af40 (diff) | |
| download | pdfium-4eb4d7f6c707cc2c23c806aa540d055c8832b55d.tar.xz | |
Revert "Fix else-after-returns throughout pdfium."
This reverts commit 7cc97521db1e52d5927f5605de5f9a7102f8af40.
Diffstat (limited to 'core/src/fxcrt/fx_basic_wstring.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_wstring.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index b6b595588d..2442daed27 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -485,8 +485,7 @@ int CFX_WideString::Compare(const CFX_WideString& str) const return 0; } return -1; - } - if (str.m_pData == NULL) { + } else if (str.m_pData == NULL) { return 1; } int this_len = m_pData->m_nDataLength; @@ -495,15 +494,13 @@ 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; - } - if (m_pData->m_String[i] > str.m_pData->m_String[i]) { + } else if (m_pData->m_String[i] > str.m_pData->m_String[i]) { return 1; } } if (this_len < that_len) { return -1; - } - if (this_len > that_len) { + } else if (this_len > that_len) { return 1; } return 0; |