Rename {read,writ}er_io_position

This commit is contained in:
Nigel Tao committed 2020-08-27 23:32:53 +10:00
1 parent 378ceb2537
commit 6069ebd619
4 files changed
+67 -11

No files matched your search

+29 -2
View File
@@ -1956,14 +1956,19 @@ typedef struct {
#ifdef __cplusplus
inline bool is_valid() const;
inline void compact();
inline uint64_t reader_io_position() const;
inline size_t reader_length() const;
inline uint8_t* reader_pointer() const;
inline uint64_t reader_position() const;
inline wuffs_base__slice_u8 reader_slice() const;
inline uint64_t writer_io_position() const;
inline size_t writer_length() const;
inline uint8_t* writer_pointer() const;
inline uint64_t writer_position() const;
inline wuffs_base__slice_u8 writer_slice() const;
// Deprecated: use reader_position.
inline uint64_t reader_io_position() const;
// Deprecated: use writer_position.
inline uint64_t writer_io_position() const;
#endif // __cplusplus
} wuffs_base__io_buffer;
@@ -2088,6 +2093,7 @@ wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {
buf->meta.ri = 0;
}
// Deprecated. Use wuffs_base__io_buffer__reader_position.
static inline uint64_t //
wuffs_base__io_buffer__reader_io_position(const wuffs_base__io_buffer* buf) {
return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0;
@@ -2103,6 +2109,11 @@ wuffs_base__io_buffer__reader_pointer(const wuffs_base__io_buffer* buf) {
return buf ? (buf->data.ptr + buf->meta.ri) : NULL;
}
static inline uint64_t //
wuffs_base__io_buffer__reader_position(const wuffs_base__io_buffer* buf) {
return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0;
}
static inline wuffs_base__slice_u8 //
wuffs_base__io_buffer__reader_slice(const wuffs_base__io_buffer* buf) {
return buf ? wuffs_base__make_slice_u8(buf->data.ptr + buf->meta.ri,
@@ -2110,6 +2121,7 @@ wuffs_base__io_buffer__reader_slice(const wuffs_base__io_buffer* buf) {
: wuffs_base__empty_slice_u8();
}
// Deprecated. Use wuffs_base__io_buffer__writer_position.
static inline uint64_t //
wuffs_base__io_buffer__writer_io_position(const wuffs_base__io_buffer* buf) {
return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;
@@ -2125,6 +2137,11 @@ wuffs_base__io_buffer__writer_pointer(const wuffs_base__io_buffer* buf) {
return buf ? (buf->data.ptr + buf->meta.wi) : NULL;
}
static inline uint64_t //
wuffs_base__io_buffer__writer_position(const wuffs_base__io_buffer* buf) {
return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;
}
static inline wuffs_base__slice_u8 //
wuffs_base__io_buffer__writer_slice(const wuffs_base__io_buffer* buf) {
return buf ? wuffs_base__make_slice_u8(buf->data.ptr + buf->meta.wi,
@@ -2159,6 +2176,11 @@ wuffs_base__io_buffer::reader_pointer() const {
return wuffs_base__io_buffer__reader_pointer(this);
}
inline uint64_t //
wuffs_base__io_buffer::reader_position() const {
return wuffs_base__io_buffer__reader_position(this);
}
inline wuffs_base__slice_u8 //
wuffs_base__io_buffer::reader_slice() const {
return wuffs_base__io_buffer__reader_slice(this);
@@ -2179,6 +2201,11 @@ wuffs_base__io_buffer::writer_pointer() const {
return wuffs_base__io_buffer__writer_pointer(this);
}
inline uint64_t //
wuffs_base__io_buffer::writer_position() const {
return wuffs_base__io_buffer__writer_position(this);
}
inline wuffs_base__slice_u8 //
wuffs_base__io_buffer::writer_slice() const {
return wuffs_base__io_buffer__writer_slice(this);