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/fpdfdoc/doc_metadata.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/fpdfdoc/doc_metadata.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_metadata.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/src/fpdfdoc/doc_metadata.cpp index 211bc25329..aeeb1d1f60 100644 --- a/core/src/fpdfdoc/doc_metadata.cpp +++ b/core/src/fpdfdoc/doc_metadata.cpp @@ -112,7 +112,8 @@ int32_t CPDF_Metadata::GetString(const CFX_ByteStringC& bsItem, CFX_WideString & } wsStr = pElmnt->GetContent(0); return wsStr.GetLength(); - } else if (bsItem == FX_BSTRC("Author")) { + } + if (bsItem == FX_BSTRC("Author")) { CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag); if (!pElmnt) { continue; @@ -127,14 +128,13 @@ int32_t CPDF_Metadata::GetString(const CFX_ByteStringC& bsItem, CFX_WideString & } wsStr = pElmnt->GetContent(0); return wsStr.GetLength(); - } else { - CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag); - if (!pElmnt) { - continue; - } - wsStr = pElmnt->GetContent(0); - return wsStr.GetLength(); } + CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag); + if (!pElmnt) { + continue; + } + wsStr = pElmnt->GetContent(0); + return wsStr.GetLength(); } return -1; } |