Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: util/file/string_file.cc

Issue 936153002: Add FileReaderInterface. Move StringFileWriter to StringFile and (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Remove unused #include Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « util/file/string_file.h ('k') | util/file/string_file_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: util/file/string_file.cc
diff --git a/util/file/string_file_writer.cc b/util/file/string_file.cc
similarity index 75%
rename from util/file/string_file_writer.cc
rename to util/file/string_file.cc
index e2669b3264c8a011cc127e4e8eb0a412106fca28..755ba2d9c204f8a9f974b21c8bd9cff1ade0461f 100644
--- a/util/file/string_file_writer.cc
+++ b/util/file/string_file.cc
@@ -12,28 +12,61 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "util/file/string_file_writer.h"
+#include "util/file/string_file.h"
#include <string.h>
+#include <algorithm>
+#include <limits>
+
#include "base/logging.h"
#include "base/numerics/safe_math.h"
#include "util/numeric/safe_assignment.h"
namespace crashpad {
-StringFileWriter::StringFileWriter() : string_(), offset_(0) {
+StringFile::StringFile() : string_(), offset_(0) {
}
-StringFileWriter::~StringFileWriter() {
+StringFile::~StringFile() {
}
-void StringFileWriter::Reset() {
+void StringFile::SetString(const std::string& string) {
+ CHECK_LE(string.size(),
+ implicit_cast<size_t>(std::numeric_limits<ssize_t>::max()));
+ string_ = string;
+ offset_ = 0;
+}
+
+void StringFile::Reset() {
string_.clear();
offset_ = 0;
}
-bool StringFileWriter::Write(const void* data, size_t size) {
+ssize_t StringFile::Read(void* data, size_t size) {
+ DCHECK(offset_.IsValid());
+
+ const size_t offset = offset_.ValueOrDie();
+ if (offset >= string_.size()) {
+ return 0;
+ }
+
+ const size_t nread = std::min(size, string_.size() - offset);
+
+ base::CheckedNumeric<ssize_t> new_offset = offset_;
+ new_offset += nread;
+ if (!new_offset.IsValid()) {
+ LOG(ERROR) << "Read(): file too large";
+ return -1;
+ }
+
+ memcpy(data, &string_[offset], nread);
+ offset_ = new_offset;
+
+ return nread;
+}
+
+bool StringFile::Write(const void* data, size_t size) {
DCHECK(offset_.IsValid());
const size_t offset = offset_.ValueOrDie();
@@ -54,7 +87,7 @@ bool StringFileWriter::Write(const void* data, size_t size) {
return true;
}
-bool StringFileWriter::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
+bool StringFile::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
DCHECK(offset_.IsValid());
if (iovecs->empty()) {
@@ -87,7 +120,7 @@ bool StringFileWriter::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
return true;
}
-FileOffset StringFileWriter::Seek(FileOffset offset, int whence) {
+FileOffset StringFile::Seek(FileOffset offset, int whence) {
DCHECK(offset_.IsValid());
size_t base_offset;
« no previous file with comments | « util/file/string_file.h ('k') | util/file/string_file_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698