mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ent::encryption: Make text helper routines take std::string

Browse Source 
Moving away from custom string type. Pure cosmetics.
This commit is contained in:
Calle Wilund
2025-10-28 12:45:49 +00:00
parent 1b0394762e
commit af85b7f61b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ent/encryption/encryption.cc
View File

@@ -165,7 +165,7 @@ bytes hmac_sha256(bytes_view msg, bytes_view key) {
return res;
}
future<temporary_buffer<char>> read_text_file_fully(const sstring& filename) {
future<temporary_buffer<char>> read_text_file_fully(const std::string& filename) {
return open_file_dma(filename, open_flags::ro).then([](file f) {
return f.size().then([f](size_t s) {
return do_with(make_file_input_stream(f), [s](input_stream<char>& in) {
@@ -179,7 +179,7 @@ future<temporary_buffer<char>> read_text_file_fully(const sstring& filename) {
});
}
future<> write_text_file_fully(const sstring& filename, temporary_buffer<char> buf) {
future<> write_text_file_fully(const std::string& filename, temporary_buffer<char> buf) {
return open_file_dma(filename, open_flags::wo|open_flags::create).then([buf = std::move(buf)](file f) mutable {
return make_file_output_stream(f).then([buf = std::move(buf)] (output_stream<char> out) mutable {
return do_with(std::move(out), [buf = std::move(buf)](output_stream<char>& out) mutable {
@@ -193,7 +193,7 @@ future<> write_text_file_fully(const sstring& filename, temporary_buffer<char> b
});
}
future<> write_text_file_fully(const sstring& filename, const sstring& s) {
future<> write_text_file_fully(const std::string& filename, const std::string& s) {
return write_text_file_fully(filename, temporary_buffer<char>(s.data(), s.size()));
}

6
ent/encryption/encryption.hh
View File

@@ -63,9 +63,9 @@ bytes calculate_sha256(const bytes&, size_t off = 0, size_t n = bytes::npos);
bytes calculate_sha256(bytes_view);
bytes hmac_sha256(bytes_view msg, bytes_view key);
future<temporary_buffer<char>> read_text_file_fully(const sstring&);
future<> write_text_file_fully(const sstring&, temporary_buffer<char>);
future<> write_text_file_fully(const sstring&, const sstring&);
future<temporary_buffer<char>> read_text_file_fully(const std::string&);
future<> write_text_file_fully(const std::string&, temporary_buffer<char>);
future<> write_text_file_fully(const std::string&, const std::string&);
std::optional<std::chrono::milliseconds> parse_expiry(std::optional<std::string>);