projects
/
rust-lightning
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c60d305
)
Have `path_to_windows_str` take reference to avoid `clone`s
author
Elias Rohrer
<dev@tnull.de>
Fri, 8 Sep 2023 07:40:45 +0000
(09:40 +0200)
committer
Elias Rohrer
<dev@tnull.de>
Fri, 8 Sep 2023 07:40:45 +0000
(09:40 +0200)
lightning-persister/src/fs_store.rs
patch
|
blob
|
history
diff --git
a/lightning-persister/src/fs_store.rs
b/lightning-persister/src/fs_store.rs
index 56d071da9f0b86ad4cf3571b9e64e8dc3c950e0e..81f9709c45467d4e6725ef83f11ba10a33734b68 100644
(file)
--- a/
lightning-persister/src/fs_store.rs
+++ b/
lightning-persister/src/fs_store.rs
@@
-26,7
+26,7
@@
macro_rules! call {
}
#[cfg(target_os = "windows")]
}
#[cfg(target_os = "windows")]
-fn path_to_windows_str<T: AsRef<OsStr>>(path: T) -> Vec<u16> {
+fn path_to_windows_str<T: AsRef<OsStr>>(path:
&
T) -> Vec<u16> {
path.as_ref().encode_wide().chain(Some(0)).collect()
}
path.as_ref().encode_wide().chain(Some(0)).collect()
}
@@
-164,8
+164,8
@@
impl KVStore for FilesystemStore {
let res = if dest_file_path.exists() {
call!(unsafe {
windows_sys::Win32::Storage::FileSystem::ReplaceFileW(
let res = if dest_file_path.exists() {
call!(unsafe {
windows_sys::Win32::Storage::FileSystem::ReplaceFileW(
- path_to_windows_str(
dest_file_path.clone()
).as_ptr(),
- path_to_windows_str(tmp_file_path).as_ptr(),
+ path_to_windows_str(
&dest_file_path
).as_ptr(),
+ path_to_windows_str(
&
tmp_file_path).as_ptr(),
std::ptr::null(),
windows_sys::Win32::Storage::FileSystem::REPLACEFILE_IGNORE_MERGE_ERRORS,
std::ptr::null_mut() as *const core::ffi::c_void,
std::ptr::null(),
windows_sys::Win32::Storage::FileSystem::REPLACEFILE_IGNORE_MERGE_ERRORS,
std::ptr::null_mut() as *const core::ffi::c_void,
@@
-175,8
+175,8
@@
impl KVStore for FilesystemStore {
} else {
call!(unsafe {
windows_sys::Win32::Storage::FileSystem::MoveFileExW(
} else {
call!(unsafe {
windows_sys::Win32::Storage::FileSystem::MoveFileExW(
- path_to_windows_str(tmp_file_path).as_ptr(),
- path_to_windows_str(
dest_file_path.clone()
).as_ptr(),
+ path_to_windows_str(
&
tmp_file_path).as_ptr(),
+ path_to_windows_str(
&dest_file_path
).as_ptr(),
windows_sys::Win32::Storage::FileSystem::MOVEFILE_WRITE_THROUGH
| windows_sys::Win32::Storage::FileSystem::MOVEFILE_REPLACE_EXISTING,
)
windows_sys::Win32::Storage::FileSystem::MOVEFILE_WRITE_THROUGH
| windows_sys::Win32::Storage::FileSystem::MOVEFILE_REPLACE_EXISTING,
)
@@
-263,8
+263,8
@@
impl KVStore for FilesystemStore {
call!(unsafe {
windows_sys::Win32::Storage::FileSystem::MoveFileExW(
call!(unsafe {
windows_sys::Win32::Storage::FileSystem::MoveFileExW(
- path_to_windows_str(dest_file_path).as_ptr(),
- path_to_windows_str(
trash_file_path.clone()
).as_ptr(),
+ path_to_windows_str(
&
dest_file_path).as_ptr(),
+ path_to_windows_str(
&trash_file_path
).as_ptr(),
windows_sys::Win32::Storage::FileSystem::MOVEFILE_WRITE_THROUGH
| windows_sys::Win32::Storage::FileSystem::MOVEFILE_REPLACE_EXISTING,
)
windows_sys::Win32::Storage::FileSystem::MOVEFILE_WRITE_THROUGH
| windows_sys::Win32::Storage::FileSystem::MOVEFILE_REPLACE_EXISTING,
)