Make http_body cross-platform

util/net/http_body.h

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #ifndef CRASHPAD_UTIL_NET_HTTP_BODY_H_
 #define CRASHPAD_UTIL_NET_HTTP_BODY_H_
 
 #include <stdint.h>
 #include <sys/types.h>
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "util/file/file_io.h"
 
 namespace crashpad {
 
 //! \brief An interface to a stream that can be used for an HTTP request body.
 class HTTPBodyStream {
  public:
   virtual ~HTTPBodyStream() {}
 
   //! \brief Copies up to \a max_len bytes into the user-supplied buffer.
   //!
@@ skipping 40 matching lines @@
   //!
   //! \param[in] path The file from which this HTTPBodyStream will read.
   explicit FileHTTPBodyStream(const base::FilePath& path);
 
   ~FileHTTPBodyStream() override;
 
   // HTTPBodyStream:
   ssize_t GetBytesBuffer(uint8_t* buffer, size_t max_len) override;
 
  private:
-  enum InvalidFD {
-    kUnopenedFile = -1,
-    kFileOpenError = -2,
-    kClosedAtEOF = -3,
+  enum FileState {
+    kUnopenedFile,
+    kFileOpenError,
+    kClosedAtEOF,
+    kReading,
   };
 
   base::FilePath path_;
 

[Mark Mentovai, 2014/12/19 22:55:56]

Nit: blank line not necessary now that there’s no comment explaining the thing
that follows.

[scottmg, 2014/12/19 22:58:33]

Done.

-  // If |fd_| is greater than or equal to zero, it is an opened descriptor
-  // from which an instance of this class is reading. If |fd_| is less than
-  // zero, the value corresponds to an InvalidFD value.
-  int fd_;
+  FileState file_state_;

[Mark Mentovai, 2014/12/19 22:55:55]

Nit: sort for optimal structure packing, file_ preceding file_state_.

[scottmg, 2014/12/19 22:58:33]

Done.

+  ScopedFileHandle file_;
 
   DISALLOW_COPY_AND_ASSIGN(FileHTTPBodyStream);
 };
 
 //! \brief An implementation of HTTPBodyStream that combines an array of
 //!     several other HTTPBodyStream objects into a single, unified stream.
 class CompositeHTTPBodyStream : public HTTPBodyStream {
  public:
   using PartsList = std::vector<HTTPBodyStream*>;
 
@@ skipping 13 matching lines @@
  private:
   PartsList parts_;
   PartsList::iterator current_part_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositeHTTPBodyStream);
 };
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_UTIL_NET_HTTP_BODY_H_