[pmg-devel] [PATCH v2 pmg-log-tracker 4/5] cleanup: remove unused strftime function

Mira Limbeck m.limbeck at proxmox.com
Mon Feb 19 18:55:46 CET 2024


since we switched to proxmox_time::strftime_local for printing the start
and end times using local time, the strftime functions in src/time.rs is
unused and can be removed

Signed-off-by: Mira Limbeck <m.limbeck at proxmox.com>
---
cleanup commit that depends on patch 1/5, only apply if patch 1/5 is
applied.

 src/time.rs | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/src/time.rs b/src/time.rs
index 9a2ce73..d26dccd 100644
--- a/src/time.rs
+++ b/src/time.rs
@@ -59,13 +59,6 @@ impl fmt::Debug for Tm {
 /// These are now exposed via `libc`, but they're part of glibc.
 mod imports {
     extern "C" {
-        pub fn strftime(
-            s: *mut libc::c_char,
-            max: libc::size_t,
-            format: *const libc::c_char,
-            tm: *const libc::tm,
-        ) -> libc::size_t;
-
         pub fn strptime(
             s: *const libc::c_char,
             format: *const libc::c_char,
@@ -123,30 +116,6 @@ impl Tm {
     }
 }
 
-/// Wrapper around `strftime(3)` to format time strings.
-pub fn strftime(format: &CStr, tm: &Tm) -> Result<String, Error> {
-    let mut buf = MaybeUninit::<[u8; 64]>::uninit();
-
-    let size = unsafe {
-        imports::strftime(
-            buf.as_mut_ptr() as *mut libc::c_char,
-            64,
-            format.as_ptr(),
-            &tm.0,
-        )
-    };
-    if size == 0 {
-        bail!("failed to format time");
-    }
-    let size = size as usize;
-
-    let buf = unsafe { buf.assume_init() };
-
-    std::str::from_utf8(&buf[..size])
-        .map_err(|_| format_err!("formatted time was not valid utf-8"))
-        .map(str::to_string)
-}
-
 /// Wrapper around `strptime(3)` to parse time strings.
 pub fn strptime(time: &str, format: &CStr) -> Result<Tm, Error> {
     // zero memory because strptime does not necessarily initialize tm_isdst, tm_gmtoff and tm_zone
-- 
2.39.2




More information about the pmg-devel mailing list