RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

uptime: don't return Result from print_nusers

Browse source
This commit is contained in:
Daniel Hofstetter 2025-05-06 10:47:10 +02:00
parent c981767af4
commit 52a2b664e2
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/uu/uptime/src/uptime.rs
View file

@ -160,7 +160,7 @@ fn uptime_with_file(file_path: &std::ffi::OsString) -> UResult<()> {
show_error!("couldn't get boot time"); show_error!("couldn't get boot time");
print_time(); print_time();
print!("up ???? days ??:??,"); print!("up ???? days ??:??,");
print_nusers(Some(0))?; print_nusers(Some(0));
print_loadavg(); print_loadavg();
set_exit_code(1); set_exit_code(1);
return Ok(()); return Ok(());
@ -170,7 +170,7 @@ fn uptime_with_file(file_path: &std::ffi::OsString) -> UResult<()> {
if non_fatal_error { if non_fatal_error {
print_time(); print_time();
print!("up ???? days ??:??,"); print!("up ???? days ??:??,");
print_nusers(Some(0))?; print_nusers(Some(0));
print_loadavg(); print_loadavg();
return Ok(()); return Ok(());
} }
@ -207,7 +207,7 @@ fn uptime_with_file(file_path: &std::ffi::OsString) -> UResult<()> {
} }
} }
print_nusers(Some(user_count))?; print_nusers(Some(user_count));
print_loadavg(); print_loadavg();
Ok(()) Ok(())
@ -236,7 +236,7 @@ fn default_uptime(matches: &ArgMatches) -> UResult<()> {
print_time(); print_time();
print_uptime(None)?; print_uptime(None)?;
print_nusers(None)?; print_nusers(None);
print_loadavg(); print_loadavg();
Ok(()) Ok(())
@ -276,7 +276,7 @@ fn process_utmpx(file: Option<&std::ffi::OsString>) -> (Option<time_t>, usize) {
(boot_time, nusers) (boot_time, nusers)
} }
fn print_nusers(nusers: Option<usize>) -> UResult<()> { fn print_nusers(nusers: Option<usize>) {
print!( print!(
"{}, ", "{}, ",
match nusers { match nusers {
@ -288,7 +288,6 @@ fn print_nusers(nusers: Option<usize>) -> UResult<()> {
} }
} }
); );
Ok(())
} }
fn print_time() { fn print_time() {