From 2827bddd85edd37a9af6fb4e47882334f007e59b Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 1 Jul 2015 14:08:08 -0700 Subject: Cherry-pick to XFA: Fix some clang warnings with -Wmissing-braces in pdfium. Clang warns if there are missing braces around a subobject initializer. The most common idiom that triggers this is: STRUCT s = {0}; if the first field of STRUCT is itself a struct. This can be more simply written as: STRUCT s = {}; which also prevents the warning from firing. Other instances of the warning have been fixed by adding braces where appropriate. R=brucedawson@chromium.org Review URL: https://codereview.chromium.org/1213523004. --- fpdfsdk/src/fpdf_flatten.cpp | 2 +- fpdfsdk/src/javascript/util.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index b9edef9941..9ef6117fe2 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -419,7 +419,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten( FPDF_PAGE page, int nFlag) { for (int iKey = 0; /*iKey < 100*/; iKey++) { - char sExtend[5] = {0}; + char sExtend[5] = {}; FXSYS_itoa(iKey, sExtend, 10); key = CFX_ByteString("FFT") + CFX_ByteString(sExtend); diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp index 22e1c6dd99..c4f03093a7 100644 --- a/fpdfsdk/src/javascript/util.cpp +++ b/fpdfsdk/src/javascript/util.cpp @@ -303,7 +303,7 @@ FX_BOOL util::printd(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& iMin = jsDate.GetMinutes(); iSec = jsDate.GetSeconds(); - struct tm time = {0}; + struct tm time = {}; time.tm_year = iYear-1900; time.tm_mon = iMonth; time.tm_mday = iDay; @@ -360,7 +360,7 @@ FX_BOOL util::printd(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& CFX_WideString strFormat; // strFormat.Format(L"%d,%d,%d,%d,%d,%d",iYear, iMonth, iDay, iHour, iMin, iSec); // CString strFormat = cppTm.Format(cFormat.c_str()); - wchar_t buf[64] = {0}; + wchar_t buf[64] = {}; strFormat = wcsftime(buf, 64, cFormat.c_str(), &time); cFormat = buf; vRet = cFormat.c_str(); @@ -399,7 +399,7 @@ void util::printd(const std::wstring &cFormat2, CJS_Date jsDate, bool bXFAPictur iMin = jsDate.GetMinutes(); iSec = jsDate.GetSeconds(); - struct tm time = {0}; + struct tm time = {}; time.tm_year = iYear-1900; time.tm_mon = iMonth; time.tm_mday = iDay; @@ -454,7 +454,7 @@ void util::printd(const std::wstring &cFormat2, CJS_Date jsDate, bool bXFAPictur } CFX_WideString strFormat; - wchar_t buf[64] = {0}; + wchar_t buf[64] = {}; strFormat = wcsftime(buf, 64, cFormat.c_str(), &time); cFormat = buf; cPurpose = cFormat; -- cgit v1.2.3