OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

directory entries are for one-time read only, remove assign/clear

master
Daniel Kolesa 2018-04-17 03:05:00 +02:00
parent 83dc828a89
commit 4c0c4e8f41
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ostd/path.hh
View File

@ -907,18 +907,6 @@ struct directory_entry {
return p_path; return p_path;
} }
void clear() {
p_path.clear();
}
void assign(ostd::path const &p) {
p_path = p;
}
void assign(ostd::path &&p) {
p_path = std::move(p);
}
private: private:
ostd::path p_path{}; ostd::path p_path{};
}; };

6
src/posix/path.cc
View File

@ -102,7 +102,7 @@ static void dir_read_next(DIR *dh, directory_entry &cur, path const &base) {
abort(); abort();
} }
if (!o) { if (!o) {
cur.clear(); cur = directory_entry{};
return; return;
} }
string_range nm{static_cast<char const *>(o->d_name)}; string_range nm{static_cast<char const *>(o->d_name)};
@ -111,7 +111,7 @@ static void dir_read_next(DIR *dh, directory_entry &cur, path const &base) {
} }
path p{base}; path p{base};
p.append(nm); p.append(nm);
cur.assign(std::move(p)); cur = std::move(p);
break; break;
} }
} }
@ -190,7 +190,7 @@ OSTD_EXPORT void rdir_range_impl::read_next() {
p_dir.remove_name(); p_dir.remove_name();
dir_read_next(static_cast<DIR *>(p_handles.top()), p_current, p_dir); dir_read_next(static_cast<DIR *>(p_handles.top()), p_current, p_dir);
} else { } else {
p_current.clear(); p_current = directory_entry{};
} }
} }
} }