Less usage of C stdio

This commit is contained in:
topjohnwu
2024-02-28 15:52:03 -08:00
parent 9ae328fd84
commit b1297c4192
3 changed files with 21 additions and 37 deletions
+1 -15
View File
@@ -60,9 +60,7 @@ struct in_stream {
};
// A stream is something that is writable and readable
struct stream : public out_stream, public in_stream {
virtual ~stream() = default;
};
struct stream : public out_stream, public in_stream {};
using stream_ptr = std::unique_ptr<stream>;
@@ -122,18 +120,6 @@ private:
* Bridge between stream class and C stdio
* ****************************************/
// sFILE -> stream_ptr
class fp_stream final : public file_stream {
public:
fp_stream(FILE *fp = nullptr) : fp(fp, fclose) {}
fp_stream(sFILE &&fp) : fp(std::move(fp)) {}
ssize_t read(void *buf, size_t len) override;
protected:
ssize_t do_write(const void *buf, size_t len) override;
private:
sFILE fp;
};
// stream_ptr -> sFILE
sFILE make_stream_fp(stream_ptr &&strm);
-9
View File
@@ -45,15 +45,6 @@ ssize_t in_stream::readFully(void *buf, size_t len) {
return read_sz;
}
ssize_t fp_stream::read(void *buf, size_t len) {
auto ret = fread(buf, 1, len, fp.get());
return ret ? ret : (ferror(fp.get()) ? -1 : 0);
}
ssize_t fp_stream::do_write(const void *buf, size_t len) {
return fwrite(buf, 1, len, fp.get());
}
bool filter_out_stream::write(const void *buf, size_t len) {
return base->write(buf, len);
}