Skip to content

Commit e0cdb26

Browse files
committed
[libc] Use the specific data type FileIOResult
1 parent 14e60be commit e0cdb26

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

libc/src/__support/File/file.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ FileIOResult File::write_unlocked_nbf(const uint8_t *data, size_t len) {
4242
if (pos > 0) { // If the buffer is not empty
4343
// Flush the buffer
4444
const size_t write_size = pos;
45-
auto write_result = platform_write(this, buf, write_size);
45+
FileIOResult write_result = platform_write(this, buf, write_size);
4646
pos = 0; // Buffer is now empty so reset pos to the beginning.
4747
// If less bytes were written than expected, then an error occurred.
4848
if (write_result < write_size) {
@@ -52,7 +52,7 @@ FileIOResult File::write_unlocked_nbf(const uint8_t *data, size_t len) {
5252
}
5353
}
5454

55-
auto write_result = platform_write(this, data, len);
55+
FileIOResult write_result = platform_write(this, data, len);
5656
if (write_result < len)
5757
err = true;
5858
return write_result;
@@ -99,7 +99,7 @@ FileIOResult File::write_unlocked_fbf(const uint8_t *data, size_t len) {
9999
// is full.
100100
const size_t write_size = pos;
101101

102-
auto buf_result = platform_write(this, buf, write_size);
102+
FileIOResult buf_result = platform_write(this, buf, write_size);
103103
size_t bytes_written = buf_result.value;
104104

105105
pos = 0; // Buffer is now empty so reset pos to the beginning.
@@ -121,7 +121,7 @@ FileIOResult File::write_unlocked_fbf(const uint8_t *data, size_t len) {
121121
pos = remainder.size();
122122
} else {
123123

124-
auto result = platform_write(this, remainder.data(), remainder.size());
124+
FileIOResult result = platform_write(this, remainder.data(), remainder.size());
125125
size_t bytes_written = buf_result.value;
126126

127127
// If less bytes were written than expected, then an error occurred. Return
@@ -237,7 +237,7 @@ FileIOResult File::read_unlocked_fbf(uint8_t *data, size_t len) {
237237
to_fetch);
238238

239239
if (to_fetch > bufsize) {
240-
auto result = platform_read(this, dataref.data(), to_fetch);
240+
FileIOResult result = platform_read(this, dataref.data(), to_fetch);
241241
size_t fetched_size = result.value;
242242
if (result.has_error() || fetched_size < to_fetch) {
243243
if (!result.has_error())
@@ -250,7 +250,7 @@ FileIOResult File::read_unlocked_fbf(uint8_t *data, size_t len) {
250250
}
251251

252252
// Fetch and buffer another buffer worth of data.
253-
auto result = platform_read(this, buf, bufsize);
253+
FileIOResult result = platform_read(this, buf, bufsize);
254254
size_t fetched_size = result.value;
255255
read_limit += fetched_size;
256256
size_t transfer_size = fetched_size >= to_fetch ? to_fetch : fetched_size;
@@ -275,7 +275,7 @@ FileIOResult File::read_unlocked_nbf(uint8_t *data, size_t len) {
275275
// Directly copy the data into |data|.
276276
cpp::span<uint8_t> dataref(static_cast<uint8_t *>(data) + available_data,
277277
len - available_data);
278-
auto result = platform_read(this, dataref.data(), dataref.size());
278+
FileIOResult result = platform_read(this, dataref.data(), dataref.size());
279279

280280
if (result.has_error() || result < dataref.size()) {
281281
if (!result.has_error())
@@ -328,7 +328,7 @@ ErrorOr<int> File::seek(off_t offset, int whence) {
328328
FileLock lock(this);
329329
if (prev_op == FileOp::WRITE && pos > 0) {
330330

331-
auto buf_result = platform_write(this, buf, pos);
331+
FileIOResult buf_result = platform_write(this, buf, pos);
332332
if (buf_result.has_error() || buf_result.value < pos) {
333333
err = true;
334334
return Error(buf_result.error);
@@ -366,7 +366,7 @@ ErrorOr<off_t> File::tell() {
366366

367367
int File::flush_unlocked() {
368368
if (prev_op == FileOp::WRITE && pos > 0) {
369-
auto buf_result = platform_write(this, buf, pos);
369+
FileIOResult buf_result = platform_write(this, buf, pos);
370370
if (buf_result.has_error() || buf_result.value < pos) {
371371
err = true;
372372
return buf_result.error;

0 commit comments

Comments
 (0)