summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2018-06-05 14:06:10 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-05 14:06:10 +0000
commit6cec70acf4ed6839c4a865c41381a6ac37de97e8 (patch)
tree03e758c713203fef08d0407c322b5337c67010f1 /testing
parentfbcc5d9afb4506eea1003d024a5fac5d601cc196 (diff)
downloadpdfium-6cec70acf4ed6839c4a865c41381a6ac37de97e8.tar.xz
Revert "Convert (void) to static_cast<void> in C++ code"
This reverts commit 80c6ab7b99bcbd7b940f78dc0cac52c30249f59c. Reason for revert: (void) idiom is prevalent through out C++ code. Original change's description: > Convert (void) to static_cast<void> in C++ code > > Converting instances of old C-style void casts to suppress return > values to use C++ style static cases. There are a few examples of > (void) that remain, since they are in C code, and the third_party/ > instances are not touched at all. > > Change-Id: I72b3fc0e1d713db669b76135e03d1cf87873a2fe > Reviewed-on: https://pdfium-review.googlesource.com/33790 > Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> > Commit-Queue: Ryan Harrison <rharrison@chromium.org> TBR=thestig@chromium.org,tsepez@chromium.org,dsinclair@chromium.org,hnakashima@chromium.org,rharrison@chromium.org Change-Id: Ib6cc021c97cb1ea7c71b90346fa9b500659f565d No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://pdfium-review.googlesource.com/33890 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'testing')
-rw-r--r--testing/embedder_test.cpp10
-rw-r--r--testing/test_support.cpp6
2 files changed, 8 insertions, 8 deletions
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index aaea965cf0..03eebe3abc 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -220,7 +220,7 @@ bool EmbedderTest::OpenDocumentHelper(const char* password,
FPDF_LoadXFA(*document);
#endif // PDF_ENABLE_XFA
- static_cast<void>(FPDF_GetDocPermissions(*document));
+ (void)FPDF_GetDocPermissions(*document);
return true;
}
@@ -262,16 +262,16 @@ void EmbedderTest::DoOpenActions() {
int EmbedderTest::GetFirstPageNum() {
int first_page = FPDFAvail_GetFirstPageNum(document_);
- static_cast<void>(FPDFAvail_IsPageAvail(
- avail_, first_page, fake_file_access_->GetDownloadHints()));
+ (void)FPDFAvail_IsPageAvail(avail_, first_page,
+ fake_file_access_->GetDownloadHints());
return first_page;
}
int EmbedderTest::GetPageCount() {
int page_count = FPDF_GetPageCount(document_);
for (int i = 0; i < page_count; ++i)
- static_cast<void>(FPDFAvail_IsPageAvail(
- avail_, i, fake_file_access_->GetDownloadHints()));
+ (void)FPDFAvail_IsPageAvail(avail_, i,
+ fake_file_access_->GetDownloadHints());
return page_count;
}
diff --git a/testing/test_support.cpp b/testing/test_support.cpp
index 16ae5b28b9..2b6f436c32 100644
--- a/testing/test_support.cpp
+++ b/testing/test_support.cpp
@@ -84,19 +84,19 @@ std::unique_ptr<char, pdfium::FreeDeleter> GetFileContents(const char* filename,
fprintf(stderr, "Failed to open: %s\n", filename);
return nullptr;
}
- static_cast<void>(fseek(file, 0, SEEK_END));
+ (void)fseek(file, 0, SEEK_END);
size_t file_length = ftell(file);
if (!file_length) {
return nullptr;
}
- static_cast<void>(fseek(file, 0, SEEK_SET));
+ (void)fseek(file, 0, SEEK_SET);
std::unique_ptr<char, pdfium::FreeDeleter> buffer(
static_cast<char*>(malloc(file_length)));
if (!buffer) {
return nullptr;
}
size_t bytes_read = fread(buffer.get(), 1, file_length, file);
- static_cast<void>(fclose(file));
+ (void)fclose(file);
if (bytes_read != file_length) {
fprintf(stderr, "Failed to read: %s\n", filename);
return nullptr;