From 2827bddd85edd37a9af6fb4e47882334f007e59b Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
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.
---
 core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp | 2 +-
 core/src/fxcrt/fxcrt_windows.cpp                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'core')

diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index ff1f6c4aa0..3d12ee9c82 100644
--- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -154,7 +154,7 @@ void CPDF_StreamContentParser::Handle_BeginImage()
 }
 void CPDF_StreamContentParser::ParsePathObject()
 {
-    FX_FLOAT params[6] = {0};
+    FX_FLOAT params[6] = {};
     int nParams = 0;
     int last_pos = m_pSyntax->GetPos();
     while (1) {
diff --git a/core/src/fxcrt/fxcrt_windows.cpp b/core/src/fxcrt/fxcrt_windows.cpp
index e3dff04413..43765a7bdd 100644
--- a/core/src/fxcrt/fxcrt_windows.cpp
+++ b/core/src/fxcrt/fxcrt_windows.cpp
@@ -98,7 +98,7 @@ FX_FILESIZE CFXCRT_FileAccess_Win64::GetSize() const
     if (!m_hFile) {
         return 0;
     }
-    LARGE_INTEGER size = {0, 0};
+    LARGE_INTEGER size = {};
     if (!::GetFileSizeEx(m_hFile, &size)) {
         return 0;
     }
@@ -109,8 +109,8 @@ FX_FILESIZE CFXCRT_FileAccess_Win64::GetPosition() const
     if (!m_hFile) {
         return (FX_FILESIZE) - 1;
     }
-    LARGE_INTEGER dist = {0, 0};
-    LARGE_INTEGER newPos = {0, 0};
+    LARGE_INTEGER dist = {};
+    LARGE_INTEGER newPos = {};
     if (!::SetFilePointerEx(m_hFile, dist, &newPos, FILE_CURRENT)) {
         return (FX_FILESIZE) - 1;
     }
@@ -123,7 +123,7 @@ FX_FILESIZE CFXCRT_FileAccess_Win64::SetPosition(FX_FILESIZE pos)
     }
     LARGE_INTEGER dist;
     dist.QuadPart = pos;
-    LARGE_INTEGER newPos = {0, 0};
+    LARGE_INTEGER newPos = {};
     if (!::SetFilePointerEx(m_hFile, dist, &newPos, FILE_BEGIN)) {
         return (FX_FILESIZE) - 1;
     }
-- 
cgit v1.2.3