TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-13 14:27:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some thrift deprecation warnings

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2021-10-23 15:22:31 +02:00
parent ce436345f9
commit cf431735cf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dwarfs/scanner.cpp
View File

@ -715,7 +715,7 @@ void scanner_<LoggerPolicy>::scan(filesystem_writer& fsw,
LOG_DEBUG << "total number of chunks: " << mv2.chunks.size(); LOG_DEBUG << "total number of chunks: " << mv2.chunks.size();
LOG_INFO << "saving directories..."; LOG_INFO << "saving directories...";
mv2.set_dir_entries(std::vector<thrift::metadata::dir_entry>()); mv2.dir_entries_ref() = std::vector<thrift::metadata::dir_entry>();
mv2.inodes.resize(last_inode); mv2.inodes.resize(last_inode);
mv2.directories.reserve(first_link_inode + 1); mv2.directories.reserve(first_link_inode + 1);
save_directories_visitor sdv(first_link_inode); save_directories_visitor sdv(first_link_inode);
@ -762,10 +762,10 @@ void scanner_<LoggerPolicy>::scan(filesystem_writer& fsw,
mv2.names = ge_data.get_names(); mv2.names = ge_data.get_names();
} else { } else {
auto ti = LOG_TIMED_INFO; auto ti = LOG_TIMED_INFO;
mv2.set_compact_names(string_table::pack( mv2.compact_names_ref() = string_table::pack(
ge_data.get_names(), string_table::pack_options( ge_data.get_names(), string_table::pack_options(
options_.pack_names, options_.pack_names_index, options_.pack_names, options_.pack_names_index,
options_.force_pack_string_tables))); options_.force_pack_string_tables));
ti << "saving names table..."; ti << "saving names table...";
} }
@ -773,11 +773,11 @@ void scanner_<LoggerPolicy>::scan(filesystem_writer& fsw,
mv2.symlinks = ge_data.get_symlinks(); mv2.symlinks = ge_data.get_symlinks();
} else { } else {
auto ti = LOG_TIMED_INFO; auto ti = LOG_TIMED_INFO;
mv2.set_compact_symlinks(string_table::pack( mv2.compact_symlinks_ref() = string_table::pack(
ge_data.get_symlinks(), ge_data.get_symlinks(),
string_table::pack_options(options_.pack_symlinks, string_table::pack_options(options_.pack_symlinks,
options_.pack_symlinks_index, options_.pack_symlinks_index,
options_.force_pack_string_tables))); options_.force_pack_string_tables));
ti << "saving symlinks table..."; ti << "saving symlinks table...";
} }

2
src/dwarfs/string_table.cpp
View File

@ -271,7 +271,7 @@ string_table::pack_generic(folly::Range<T const*> input,
buffer.resize(compressed_size); buffer.resize(compressed_size);
output.buffer.swap(buffer); output.buffer.swap(buffer);
output.set_symtab(std::move(symtab)); output.symtab_ref() = std::move(symtab);
output.index.resize(size); output.index.resize(size);
std::copy(out_len_vec.begin(), out_len_vec.end(), output.index.begin()); std::copy(out_len_vec.begin(), out_len_vec.end(), output.index.begin());
} else { } else {