diff options
author | Loo Rong Jie <loorongjie@gmail.com> | 2018-07-10 23:34:50 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-07-10 23:36:12 -0700 |
commit | 30f38d0e7deed375c1aeb2693ee6b2c571c99c55 (patch) | |
tree | ebec0fd72cfeac5b662ce18efb16629e6d22442a /src/tools/singlejar/desugar_checking.cc | |
parent | f600b693642b3ee2475c6222a0eebb25371c6ca6 (diff) |
[singlejar] Various portability fixes for MSVC
- MSVC does not have `errx` functions, so use `diag_errx` etc. instead.
- Fix format when trying to print `size_t`, use `%zu` so that the function will handle 32/64-bit `size_t` according to target system automatically.
- Adding/guarding a few includes for MSVC.
- MSVC does not have `ssize_t`, so replace it with `ptrdiff_t`
#2241
/cc @laszlocsomor
Closes #5499.
PiperOrigin-RevId: 204074420
Diffstat (limited to 'src/tools/singlejar/desugar_checking.cc')
-rw-r--r-- | src/tools/singlejar/desugar_checking.cc | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/tools/singlejar/desugar_checking.cc b/src/tools/singlejar/desugar_checking.cc index 13f45f9583..1fa6e50ac0 100644 --- a/src/tools/singlejar/desugar_checking.cc +++ b/src/tools/singlejar/desugar_checking.cc @@ -27,7 +27,7 @@ bool Java8DesugarDepsChecker::Merge(const CDH *cdh, const LH *lh) { } buffer_->DecompressEntryContents(cdh, lh, inflater_.get()); } else { - errx(2, "META-INF/desugar_deps is neither stored nor deflated"); + diag_errx(2, "META-INF/desugar_deps is neither stored nor deflated"); } // TODO(kmb): Wrap buffer_ as ZeroCopyInputStream to avoid copying out. @@ -41,10 +41,10 @@ bool Java8DesugarDepsChecker::Merge(const CDH *cdh, const LH *lh) { bazel::tools::desugar::DesugarDepsInfo deps_info; google::protobuf::io::CodedInputStream content(buf, data_size); if (!deps_info.ParseFromCodedStream(&content)) { - errx(2, "META-INF/desugar_deps: unable to parse"); + diag_errx(2, "META-INF/desugar_deps: unable to parse"); } if (!content.ConsumedEntireMessage()) { - errx(2, "META-INF/desugar_deps: unexpected trailing content"); + diag_errx(2, "META-INF/desugar_deps: unexpected trailing content"); } free(buf); @@ -91,10 +91,10 @@ bool Java8DesugarDepsChecker::Merge(const CDH *cdh, const LH *lh) { void *Java8DesugarDepsChecker::OutputEntry(bool compress) { if (verbose_) { - fprintf(stderr, "Needed deps: %lu\n", needed_deps_.size()); - fprintf(stderr, "Interfaces to check: %lu\n", missing_interfaces_.size()); - fprintf(stderr, "Sub-interfaces: %lu\n", extended_interfaces_.size()); - fprintf(stderr, "Interfaces w/ default methods: %lu\n", + fprintf(stderr, "Needed deps: %zu\n", needed_deps_.size()); + fprintf(stderr, "Interfaces to check: %zu\n", missing_interfaces_.size()); + fprintf(stderr, "Sub-interfaces: %zu\n", extended_interfaces_.size()); + fprintf(stderr, "Interfaces w/ default methods: %zu\n", has_default_methods_.size()); } for (auto needed : needed_deps_) { @@ -103,9 +103,10 @@ void *Java8DesugarDepsChecker::OutputEntry(bool compress) { } if (!known_member_(needed.first)) { if (fail_on_error_) { - errx(2, "%s referenced by %s but not found. Is the former defined in " - "a neverlink library?", - needed.first.c_str(), needed.second.c_str()); + diag_errx(2, + "%s referenced by %s but not found. Is the former defined" + " in a neverlink library?", + needed.first.c_str(), needed.second.c_str()); } else { error_ = true; } @@ -118,9 +119,11 @@ void *Java8DesugarDepsChecker::OutputEntry(bool compress) { } if (HasDefaultMethods(missing.first)) { if (fail_on_error_) { - errx(2, "%s needed on the classpath for desugaring %s. Please add the " - "missing dependency to the target containing the latter.", - missing.first.c_str(), missing.second.c_str()); + diag_errx( + 2, + "%s needed on the classpath for desugaring %s. Please add" + " the missing dependency to the target containing the latter.", + missing.first.c_str(), missing.second.c_str()); } else { error_ = true; } |