diff options
| author | weili <weili@chromium.org> | 2016-05-20 15:38:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-20 15:38:30 -0700 |
| commit | 038aa531bcf1a76764d3cef46fd9b8e08b166dae (patch) | |
| tree | d1ef7d15ff37e4c98d1d7522b225755ba99bc330 /xfa/fxfa/parser/xfa_localemgr.cpp | |
| parent | dc3ccdfb49c4d533d524d2084a7ebe5117f35934 (diff) | |
| download | pdfium-038aa531bcf1a76764d3cef46fd9b8e08b166dae.tar.xz | |
Clean up XFA code which causes warnings
This is part of efforts to bring XFA to chromium_code standard.
The warnings are from unreachable code, or using potentially
uninitialized variables, or using assignment within a condition.
This change list only contains easy to fix cases. More cleanups
will follow.
BUG=pdfium:29
Review-Url: https://codereview.chromium.org/1998873002
Diffstat (limited to 'xfa/fxfa/parser/xfa_localemgr.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_localemgr.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index 0982537b15..83c7cf025d 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp @@ -1123,9 +1123,8 @@ static uint16_t XFA_GetLanguage(CFX_WideString wsLanguage) { CXFA_LocaleMgr::CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid) : m_dwLocaleFlags(0x00) { m_dwDeflcid = XFA_GetLanguage(wsDeflcid); - CXFA_Node* pNodeLocale = NULL; - if (pLocaleSet && - (pNodeLocale = pLocaleSet->GetNodeItem(XFA_NODEITEM_FirstChild))) { + if (pLocaleSet) { + CXFA_Node* pNodeLocale = pLocaleSet->GetNodeItem(XFA_NODEITEM_FirstChild); while (pNodeLocale) { m_LocaleArray.Add(new CXFA_NodeLocale(pNodeLocale)); pNodeLocale = pNodeLocale->GetNodeItem(XFA_NODEITEM_NextSibling); |