Use smart pointers

This commit is contained in:
topjohnwu
2019-11-23 04:57:52 -05:00
parent 5bee1c56a9
commit 01253f050a
8 changed files with 87 additions and 81 deletions

View File

@@ -1,16 +1,19 @@
#pragma once
#include <unistd.h>
#include <stdio.h>
#include <memory>
#include "../files.h"
class stream;
FILE *open_stream(stream *strm);
using stream_ptr = std::unique_ptr<stream>;
sFILE make_stream(stream_ptr &&strm);
template <class T, class... Args>
FILE *open_stream(Args &&... args) {
return open_stream(new T(args...));
sFILE make_stream(Args &&... args) {
return make_stream(stream_ptr(new T(std::forward<Args>(args)...)));
}
class stream {
@@ -24,20 +27,20 @@ public:
// Delegates all operations to the base FILE pointer
class filter_stream : public stream {
public:
filter_stream(FILE *fp) : fp(fp) {}
~filter_stream() override;
filter_stream() = default;
filter_stream(sFILE &&fp) : fp(std::move(fp)) {}
int read(void *buf, size_t len) override;
int write(const void *buf, size_t len) override;
void set_base(FILE *f);
void set_base(sFILE &&f);
template <class T, class... Args >
void set_base(Args&&... args) {
set_base(open_stream<T>(args...));
set_base(make_stream<T>(std::forward<Args>(args)...));
}
protected:
FILE *fp;
sFILE fp;
};
// Handy interface for classes that need custom seek logic
@@ -65,7 +68,7 @@ private:
size_t _cap = 0;
void resize(size_t new_pos, bool zero = false);
size_t end_pos() override { return _len; }
size_t end_pos() final { return _len; }
};
// File stream but does not close the file descriptor at any time