commit 4dbaafa75b890435bd5232a22eb3b6086467daf3
author Greg Kaiser <gkaiser@google.com> Mon Feb 11 07:25:10 2019 -0800
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 11 18:00:22 2019 +0000
tree 05119fa8cbc8f4b0ee29f655039b9e30cd1d701c
parent 837178206e2f5da5f2d3cbf97d15b177f0ab1ce4

bookmaker: Remove fflush() on closed file

fflush() requires an open file handle, so it shouldn't be called
right after fclose().  And fclose() performs an fflush(), by
definition (see http://man7.org/linux/man-pages/man3/fclose.3.html ),
so we can remove this fflush() call altogether.

Change-Id: I8fbdd5a85b3cdb5edfdabbd5dca449ea1d4fce2d
Reviewed-on: https://skia-review.googlesource.com/c/191321
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

tools/bookmaker/includeWriter.cpp

diff --git a/tools/bookmaker/includeWriter.cpp b/tools/bookmaker/includeWriter.cpp
index 34f6f08..5a85298 100644
--- a/tools/bookmaker/includeWriter.cpp
+++ b/tools/bookmaker/includeWriter.cpp
@@ -2066,7 +2066,6 @@
         this->lfcr();
         this->writePending();
         fclose(fOut);
-        fflush(fOut);
         size_t slash = fFileName.find_last_of('/');
         if (string::npos == slash) {
             slash = 0;

tools/bookmaker/mdOut.cpp

diff --git a/tools/bookmaker/mdOut.cpp b/tools/bookmaker/mdOut.cpp
index 366135f..bb61318 100644
--- a/tools/bookmaker/mdOut.cpp
+++ b/tools/bookmaker/mdOut.cpp
@@ -740,7 +740,6 @@
     if (fOut) {
         this->writePending();
         fclose(fOut);
-        fflush(fOut);
         if (ParserCommon::WrittenFileDiffers(fullName, filename)) {
             ParserCommon::CopyToFile(fullName, filename);
             SkDebugf("wrote %s\n", fullName.c_str());

tools/bookmaker/parserCommon.cpp

diff --git a/tools/bookmaker/parserCommon.cpp b/tools/bookmaker/parserCommon.cpp
index 5a8867a..3b22d4b 100644
--- a/tools/bookmaker/parserCommon.cpp
+++ b/tools/bookmaker/parserCommon.cpp
@@ -346,7 +346,6 @@
     memset(buffer, ' ', *size);
     SkAssertResult(*size == (int)fread(buffer, 1, *size, file));
     fclose(file);
-    fflush(file);
     return buffer;
 }