summaryrefslogtreecommitdiff
path: root/core/include/fxcrt
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-03-01 14:45:20 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-03-01 14:45:20 -0500
commit738b08ce6b9f80d93b815411b47c2b11c2f090f6 (patch)
treeec648b9bdf6d9597043bfe657d56f98dc3cdef30 /core/include/fxcrt
parent50dfc4a7068e8e08105f7b9a3945136e7246e677 (diff)
downloadpdfium-738b08ce6b9f80d93b815411b47c2b11c2f090f6.tar.xz
Fix and enable lint checks.
This CL fixes and enables: * readability/namespace * readability/multiline_string * readability/multiline_comment * readability/inheritance * readability/function * readability/braces R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1747123002 .
Diffstat (limited to 'core/include/fxcrt')
-rw-r--r--core/include/fxcrt/fx_basic.h11
-rw-r--r--core/include/fxcrt/fx_memory.h2
2 files changed, 6 insertions, 7 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index 6e092dd540..006b2b377d 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -315,13 +315,12 @@ class CFX_ArrayTemplate : public CFX_BasicArray {
TYPE* GetData() { return (TYPE*)m_pData; }
FX_BOOL SetAtGrow(int nIndex, TYPE newElement) {
- if (nIndex < 0) {
+ if (nIndex < 0)
return FALSE;
- }
- if (nIndex >= m_nSize)
- if (!SetSize(nIndex + 1)) {
- return FALSE;
- }
+
+ if (nIndex >= m_nSize && !SetSize(nIndex + 1))
+ return FALSE;
+
((TYPE*)m_pData)[nIndex] = newElement;
return TRUE;
}
diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h
index d64844e743..b9b1888930 100644
--- a/core/include/fxcrt/fx_memory.h
+++ b/core/include/fxcrt/fx_memory.h
@@ -98,7 +98,7 @@ class CFX_GrowOnlyPool {
void* Realloc(void* p, size_t new_size) { return NULL; }
- void Free(void*) {}
+ void Free(void* mem) {}
void FreeAll();