commit 6c7a857f7ee6ad009122fa377ce0f6551c091445
author Jeremy Chinsen <chinsenj@google.com> Fri Jun 21 00:20:17 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Jun 21 00:20:17 2019 +0000
tree fc95ce794169cdc6daffdf8384ccff46f55407e7
parent 87d2021908695fc41d1b2789e2ab2a0cfc4dcbdf

Refactor buffer writes to files in pdfium_test_write_helper.cc

In pdfium_test_write_helper.cc, both WriteAttachments() and
WriteImages() writes buffers to files. These portions of the
functions were nearly identical so they should be refactored
into a separate helper function.

Previous success message "Saved attachment <attachment_name>
as: <file_name>." is now "Successfully wrote attachment as
<file_name>".


Change-Id: I0a5d729cfa1add437abdfa9999aa209c9183b647
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/56634
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

samples/pdfium_test_write_helper.cc

diff --git a/samples/pdfium_test_write_helper.cc b/samples/pdfium_test_write_helper.cc
index 23164a8..fac1872 100644
--- a/samples/pdfium_test_write_helper.cc
+++ b/samples/pdfium_test_write_helper.cc
@@ -505,6 +505,24 @@
 }
 #endif
 
+void WriteBufferToFile(const void* buf,
+                       size_t buflen,
+                       const char* filename,
+                       const char* filetype) {
+  FILE* fp = fopen(filename, "wb");
+  if (!fp) {
+    fprintf(stderr, "Failed to open %s for saving %s.", filename, filetype);
+    return;
+  }
+
+  size_t bytes_written = fwrite(buf, 1, buflen, fp);
+  if (bytes_written == buflen)
+    fprintf(stderr, "Successfully wrote %s %s.\n", filetype, filename);
+  else
+    fprintf(stderr, "Failed to write to %s.\n", filename);
+  fclose(fp);
+}
+
 void WriteAttachments(FPDF_DOCUMENT doc, const std::string& name) {
   for (int i = 0; i < FPDFDoc_GetAttachmentCount(doc); ++i) {
     FPDF_ATTACHMENT attachment = FPDFDoc_GetAttachment(doc, i);
@@ -531,7 +549,7 @@
                  attachment_name.c_str());
     if (chars_formatted < 0 ||
         static_cast<size_t>(chars_formatted) >= sizeof(save_name)) {
-      fprintf(stderr, "Filename %s is too long\n", save_name);
+      fprintf(stderr, "Filename %s is too long.\n", save_name);
       continue;
     }
 
@@ -550,20 +568,7 @@
     }
 
     // Write the attachment file.
-    FILE* fp = fopen(save_name, "wb");
-    if (!fp) {
-      fprintf(stderr, "Failed to open %s for saving attachment.\n", save_name);
-      continue;
-    }
-
-    size_t written_len = fwrite(data_buf.data(), 1, length_bytes, fp);
-    if (written_len == length_bytes) {
-      fprintf(stderr, "Saved attachment \"%s\" as: %s.\n",
-              attachment_name.c_str(), save_name);
-    } else {
-      fprintf(stderr, "Failed to write to %s\n", save_name);
-    }
-    fclose(fp);
+    WriteBufferToFile(data_buf.data(), length_bytes, save_name, "attachment");
   }
 }
 
@@ -627,23 +632,11 @@
                                    pdf_name, page_num, i);
     if (chars_formatted < 0 ||
         static_cast<size_t>(chars_formatted) >= sizeof(filename)) {
-      fprintf(stderr, "Filename %s for saving image is too long\n", filename);
+      fprintf(stderr, "Filename %s for saving image is too long.\n", filename);
       continue;
     }
 
-    FILE* fp = fopen(filename, "wb");
-    if (!fp) {
-      fprintf(stderr, "Failed to open %s for saving image.\n", filename);
-      continue;
-    }
-
-    size_t bytes_written =
-        fwrite(&png_encoding.front(), 1, png_encoding.size(), fp);
-    if (bytes_written != png_encoding.size())
-      fprintf(stderr, "Failed to write to %s.\n", filename);
-    else
-      fprintf(stderr, "Successfully wrote embedded image %s.\n", filename);
-
-    (void)fclose(fp);
+    WriteBufferToFile(&png_encoding.front(), png_encoding.size(), filename,
+                      "image");
   }
 }