From d2471ca0fa0ff537aac9f4c586cd9a516512f6be Mon Sep 17 00:00:00 2001
From: Michiel <michielp1807@gmail.com>
Date: Thu, 12 Sep 2024 13:53:21 +0200
Subject: [PATCH] Refactor source status print statement

---
 ntpd/src/ctl.rs | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/ntpd/src/ctl.rs b/ntpd/src/ctl.rs
index b996e7656..eba9e0f47 100644
--- a/ntpd/src/ctl.rs
+++ b/ntpd/src/ctl.rs
@@ -243,11 +243,7 @@ async fn print_state(print: Format, observe_socket: PathBuf) -> Result<ExitCode,
             println!("Sources:");
             for source in &output.sources {
                 println!(
-                    concat!(
-                        "{}/{}{} ({}): {:+.6}±{:.6}(±{:.6})s\n{}",
-                        "    poll interval: {:.0}s, missing polls: {}\n",
-                        "    root dispersion: {:.6}s, root delay:{:.6}s"
-                    ),
+                    "{}/{}{} ({}): {:+.6}±{:.6}(±{:.6})s",
                     source.name,
                     source.address,
                     source.nts_cookies.map_or("", |_| " [NTS]"),
@@ -255,16 +251,24 @@ async fn print_state(print: Format, observe_socket: PathBuf) -> Result<ExitCode,
                     source.timedata.offset.to_seconds(),
                     source.timedata.uncertainty.to_seconds(),
                     source.timedata.delay.to_seconds(),
-                    source.nts_cookies.map_or(String::new(), |c| format!(
-                        "    NTS cookies: {}/{} available\n",
-                        c,
-                        ntp_proto::MAX_COOKIES,
-                    )),
+                );
+                println!(
+                    "    poll interval: {:.0}s, missing polls: {}",
                     source.poll_interval.as_duration().to_seconds(),
                     source.unanswered_polls,
+                );
+                println!(
+                    "    root dispersion: {:.6}s, root delay:{:.6}s",
                     source.timedata.remote_uncertainty.to_seconds(),
-                    source.timedata.remote_delay.to_seconds(),
+                    source.timedata.remote_delay.to_seconds()
                 );
+                if let Some(nts_cookies) = source.nts_cookies {
+                    println!(
+                        "    NTS cookies: {}/{} available",
+                        nts_cookies,
+                        ntp_proto::MAX_COOKIES
+                    )
+                }
             }
             println!();
             println!("Servers:");