RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

cp: fix compiler warnings

Browse source 
Fixes seven compiler warnings in cp.rs:
- unused imports: `c_char`, `c_int`
  -> removed
- value assigned to `inode` is never read
  -> no more default value, immutable
- value assigned to `nlinks` is never read
  -> no more default value, immutable
- unused variable: `src_path`
  -> removed
- unused `std::result::Result` which must be used
  -> only in error on unsupported platforms (Windows) which is
     already handled with #[cfg(unix)]
- variable `preserve_context` is assigned to, but never used
  -> removed
- value assigned to `preserve_context` is never read
  -> see above, remove
This commit is contained in:
shutefan 2017-10-04 21:43:06 +02:00
parent ab259194f3
commit c20ce9bf74
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/cp/cp.rs
View file

@ -50,9 +50,6 @@ use std::fs::File;
use std::fs::OpenOptions; use std::fs::OpenOptions;
use filetime::FileTime; use filetime::FileTime;
#[cfg(target_os = "linux")]
use libc::{c_int, c_char};
#[cfg(unix)] use std::os::unix::fs::PermissionsExt; #[cfg(unix)] use std::os::unix::fs::PermissionsExt;
#[cfg(target_os = "linux")] ioctl!(write ficlone with 0x94, 9; std::os::raw::c_int); #[cfg(target_os = "linux")] ioctl!(write ficlone with 0x94, 9; std::os::raw::c_int);
@ -681,8 +678,8 @@ fn preserve_hardlinks(hard_links: &mut Vec<(String, u64)>, source: &std::path::P
if !source.is_dir() { if !source.is_dir() {
unsafe { unsafe {
let src_path = CString::new(source.as_os_str().to_str().unwrap()).unwrap(); let src_path = CString::new(source.as_os_str().to_str().unwrap()).unwrap();
let mut inode: u64 = 0; let inode: u64;
let mut nlinks = 0; let nlinks: u64;
#[cfg(unix)] #[cfg(unix)]
{ {
let mut stat = mem::zeroed(); let mut stat = mem::zeroed();
@ -750,7 +747,6 @@ fn copy(sources: &[Source], target: &Target, options: &Options) -> CopyResult<()
let mut found_hard_link = false; let mut found_hard_link = false;
if preserve_hard_links { if preserve_hard_links {
let dest = construct_dest_path(source, target, &target_type, options)?; let dest = construct_dest_path(source, target, &target_type, options)?;
let src_path = CString::new(Path::new(&source.clone()).as_os_str().to_str().unwrap()).unwrap();
preserve_hardlinks(&mut hard_links, source, dest, &mut found_hard_link).unwrap(); preserve_hardlinks(&mut hard_links, source, dest, &mut found_hard_link).unwrap();
} }
if !found_hard_link { if !found_hard_link {
@ -907,7 +903,7 @@ fn copy_attribute(source: &Path, dest: &Path, attribute: &Attribute) -> CopyResu
let xattrs = xattr::list(source)?; let xattrs = xattr::list(source)?;
for attr in xattrs { for attr in xattrs {
if let Some(attr_value) = xattr::get(source, attr.clone())? { if let Some(attr_value) = xattr::get(source, attr.clone())? {
xattr::set(dest, attr, &attr_value[..]); crash_if_err!(EXIT_ERR, xattr::set(dest, attr, &attr_value[..]));
} }
} }
} }
@ -988,13 +984,6 @@ fn copy_file(source: &Path, dest: &Path, options: &Options) -> CopyResult<()> {
println!("{}", context_for(source, dest)); println!("{}", context_for(source, dest));
} }
let mut preserve_context = false;
for attribute in &options.preserve_attributes {
if *attribute == Attribute::Context {
preserve_context = true;
}
}
match options.copy_mode { match options.copy_mode {
CopyMode::Link => { CopyMode::Link => {
fs::hard_link(source, dest).context(&*context_for(source, dest))?; fs::hard_link(source, dest).context(&*context_for(source, dest))?;