From d33fe262b974a6dd6ad4de02fbc8727fc9f64cdc Mon Sep 17 00:00:00 2001 From: Oliver Kunz Date: Mon, 11 Mar 2024 01:13:16 -0700 Subject: [PATCH] We have deprecated `sapi::v::NullPtr` earlier this year. Users of SAPI can now pass directly a `nullptr` to the sandboxed API function. We believe that this will reduce development efforts and improve readability. PiperOrigin-RevId: 614571112 Change-Id: I856a656d115f6cef6f9dc933e47ff6c2a7d7b722 --- contrib/brotli/utils/utils_brotli_dec.cc | 13 ++++++------- contrib/brotli/utils/utils_brotli_dec.h | 1 - contrib/brotli/utils/utils_brotli_enc.cc | 12 ++++++------ contrib/brotli/utils/utils_brotli_enc.h | 1 - 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/contrib/brotli/utils/utils_brotli_dec.cc b/contrib/brotli/utils/utils_brotli_dec.cc index 2e98ae7..9b21d51 100644 --- a/contrib/brotli/utils/utils_brotli_dec.cc +++ b/contrib/brotli/utils/utils_brotli_dec.cc @@ -23,7 +23,7 @@ absl::Status BrotliDecoder::InitStructs() { SAPI_ASSIGN_OR_RETURN( BrotliDecoderState * state, - api_.BrotliDecoderCreateInstance(&null_ptr_, &null_ptr_, &null_ptr_)); + api_.BrotliDecoderCreateInstance(nullptr, nullptr, nullptr)); state_.SetRemote(state); @@ -84,12 +84,11 @@ absl::StatusOr BrotliDecoder::Decompress( sapi::v::IntBase sapi_avilable_out(0); - SAPI_ASSIGN_OR_RETURN( - BrotliDecoderResult ret, - api_.BrotliDecoderDecompressStream( - state_.PtrNone(), sapi_size_in.PtrBefore(), - sapi_opaque_buf_in.PtrBefore(), sapi_avilable_out.PtrBefore(), - &null_ptr_, &null_ptr_)); + SAPI_ASSIGN_OR_RETURN(BrotliDecoderResult ret, + api_.BrotliDecoderDecompressStream( + state_.PtrNone(), sapi_size_in.PtrBefore(), + sapi_opaque_buf_in.PtrBefore(), + sapi_avilable_out.PtrBefore(), nullptr, nullptr)); // Ignore output error, as we didn't provide any buffer. if (ret == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) { diff --git a/contrib/brotli/utils/utils_brotli_dec.h b/contrib/brotli/utils/utils_brotli_dec.h index 1ce2182..12665ae 100644 --- a/contrib/brotli/utils/utils_brotli_dec.h +++ b/contrib/brotli/utils/utils_brotli_dec.h @@ -44,7 +44,6 @@ class BrotliDecoder { BrotliApi api_; absl::Status status; sapi::v::GenericPtr state_; - sapi::v::NullPtr null_ptr_; }; #endif // CONTRIB_BROTLI_UTILS_UTILS_BROTLI_DEC_H_ diff --git a/contrib/brotli/utils/utils_brotli_enc.cc b/contrib/brotli/utils/utils_brotli_enc.cc index f9b7a7b..f34c252 100644 --- a/contrib/brotli/utils/utils_brotli_enc.cc +++ b/contrib/brotli/utils/utils_brotli_enc.cc @@ -23,7 +23,7 @@ absl::Status BrotliEncoder::InitStructs() { SAPI_ASSIGN_OR_RETURN( BrotliEncoderState * state, - api_.BrotliEncoderCreateInstance(&null_ptr_, &null_ptr_, &null_ptr_)); + api_.BrotliEncoderCreateInstance(nullptr, nullptr, nullptr)); state_.SetRemote(state); @@ -84,11 +84,11 @@ absl::Status BrotliEncoder::Compress(std::vector& buf_in, sapi::v::IntBase sapi_avilable_out(0); - SAPI_ASSIGN_OR_RETURN( - bool ret, api_.BrotliEncoderCompressStream( - state_.PtrNone(), op, sapi_size_in.PtrBefore(), - sapi_opaque_buf_in.PtrBefore(), - sapi_avilable_out.PtrBefore(), &null_ptr_, &null_ptr_)); + SAPI_ASSIGN_OR_RETURN(bool ret, + api_.BrotliEncoderCompressStream( + state_.PtrNone(), op, sapi_size_in.PtrBefore(), + sapi_opaque_buf_in.PtrBefore(), + sapi_avilable_out.PtrBefore(), nullptr, nullptr)); if (!ret) { return absl::UnavailableError("Unable to compress input"); } diff --git a/contrib/brotli/utils/utils_brotli_enc.h b/contrib/brotli/utils/utils_brotli_enc.h index ed1f25b..0c8c9ee 100644 --- a/contrib/brotli/utils/utils_brotli_enc.h +++ b/contrib/brotli/utils/utils_brotli_enc.h @@ -45,7 +45,6 @@ class BrotliEncoder { BrotliApi api_; absl::Status status; sapi::v::GenericPtr state_; - sapi::v::NullPtr null_ptr_; }; #endif // CONTRIB_BROTLI_UTILS_UTILS_BROTLI_ENC_H_