@@ -3511,9 +3511,7 @@ class Client {
35113511 SpanOptions (std::forward<Options>(options)...));
35123512 internal::ResumableUploadRequest request (bucket_name, object_name);
35133513 request.set_multiple_options (std::forward<Options>(options)...);
3514- auto source = connection_->UploadFileResumable (file_name, request);
3515- if (!source) return source.status ();
3516- return UploadStreamResumable (*source.value (), request);
3514+ return UploadFileResumable (file_name, request);
35173515 }
35183516
35193517 // The version of UploadFile() where UseResumableUploadSession is *not* one of
@@ -3532,19 +3530,22 @@ class Client {
35323530 internal::InsertObjectMediaRequest request (bucket_name, object_name,
35333531 std::string{});
35343532 request.set_multiple_options (std::forward<Options>(options)...);
3535- auto status = connection_->UploadFileSimple (file_name, file_size, request);
3536- if (!status) return status.status ();
3537- return connection_->InsertObjectMedia (request);
3533+ return UploadFileSimple (file_name, file_size, request);
35383534 }
35393535 internal::ResumableUploadRequest request (bucket_name, object_name);
35403536 request.set_multiple_options (std::forward<Options>(options)...);
3541- auto source = connection_->UploadFileResumable (file_name, request);
3542- if (!source) return source.status ();
3543- return UploadStreamResumable (*source.value (), request);
3537+ return UploadFileResumable (file_name, request);
35443538 }
35453539
35463540 static bool UseSimpleUpload (std::string const & file_name, std::size_t & size);
35473541
3542+ StatusOr<ObjectMetadata> UploadFileSimple (
3543+ std::string const & file_name, std::size_t file_size,
3544+ internal::InsertObjectMediaRequest request);
3545+
3546+ StatusOr<ObjectMetadata> UploadFileResumable (
3547+ std::string const & file_name, internal::ResumableUploadRequest request);
3548+
35483549 StatusOr<ObjectMetadata> UploadStreamResumable (
35493550 std::istream& source,
35503551 internal::ResumableUploadRequest const & request) const ;
0 commit comments