diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-03-09 09:59:23 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-03-09 09:59:23 -0500 |
| commit | 3ebd121d45ceb08918a3dcb5b3b7ac29448c862f (patch) | |
| tree | 361d5fa0f9be7484cce4aace1b9cc18545046611 /core/include | |
| parent | 317758574e173367b41928a1575d70600c6b6ea8 (diff) | |
| download | pdfium-3ebd121d45ceb08918a3dcb5b3b7ac29448c862f.tar.xz | |
Review and cleanup lint warnings.
This CL goes through the remaining list of list warnings and records why they
are currently blacklisted, or fixes and enables them.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1773733002 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_objects.h | 2 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_system.h | 7 | ||||
| -rw-r--r-- | core/include/fxge/fx_ge.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index 58d98e5436..a6fa056e13 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -337,7 +337,7 @@ class CPDF_Dictionary : public CPDF_Object { // Set* functions invalidate iterators for the element with the key |key|. void SetAt(const CFX_ByteStringC& key, CPDF_Object* pObj); void SetAtName(const CFX_ByteStringC& key, const CFX_ByteString& name); - void SetAtString(const CFX_ByteStringC& key, const CFX_ByteString& string); + void SetAtString(const CFX_ByteStringC& key, const CFX_ByteString& str); void SetAtInteger(const CFX_ByteStringC& key, int i); void SetAtNumber(const CFX_ByteStringC& key, FX_FLOAT f); void SetAtReference(const CFX_ByteStringC& key, diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 462fb3babf..76c413e7e3 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -157,9 +157,12 @@ FXSYS_FILE* FXSYS_wfopen(const FX_WCHAR* filename, const FX_WCHAR* mode); #ifdef __cplusplus } // extern "C" + #include "third_party/base/numerics/safe_conversions.h" + #define FXSYS_strlen(ptr) pdfium::base::checked_cast<FX_STRSIZE>(strlen(ptr)) #define FXSYS_wcslen(ptr) pdfium::base::checked_cast<FX_STRSIZE>(wcslen(ptr)) + extern "C" { #else #define FXSYS_strlen(ptr) ((FX_STRSIZE)strlen(ptr)) @@ -206,7 +209,7 @@ extern "C" { #define FXSYS_GetModuleFileName GetModuleFileName #else int FXSYS_GetACP(void); -char* FXSYS_itoa(int value, char* string, int radix); +char* FXSYS_itoa(int value, char* str, int radix); int FXSYS_WideCharToMultiByte(FX_DWORD codepage, FX_DWORD dwFlags, const wchar_t* wstr, @@ -229,7 +232,7 @@ FX_DWORD FXSYS_GetModuleFileName(void* hModule, char* buf, FX_DWORD bufsize); char* FXSYS_strlwr(char* str); char* FXSYS_strupr(char* str); int FXSYS_stricmp(const char*, const char*); -int FXSYS_wcsicmp(const wchar_t* string1, const wchar_t* string2); +int FXSYS_wcsicmp(const wchar_t* str1, const wchar_t* str2); wchar_t* FXSYS_wcslwr(wchar_t* str); wchar_t* FXSYS_wcsupr(wchar_t* str); #endif // _FXM_PLATFORM == _FXM_PLATFORM_WINDOWS_ diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h index c5d409c41c..fc9119b123 100644 --- a/core/include/fxge/fx_ge.h +++ b/core/include/fxge/fx_ge.h @@ -591,7 +591,7 @@ class IFX_RenderDeviceDriver { class IFX_PSOutput { public: virtual void Release() = 0; - virtual void OutputPS(const FX_CHAR* string, int len) = 0; + virtual void OutputPS(const FX_CHAR* str, int len) = 0; protected: virtual ~IFX_PSOutput() {} |