rust: remove util.c util_format_datetime, do it in Rust

Author: benma

src/rust/bitbox02/src/lib.rs

@@ -131,20 +131,19 @@ pub fn strftime(timestamp: u32, format: &str) -> String {
         .into()
 }
 
+/// Formats the timestamp in the local timezone.
+/// timestamp is the unix timestamp in seconds.
+/// timezone_offset is added to the timestamp, timezone part.
+/// date_only: if true, only the date is formatted. If false, both date and time are.
 pub fn format_datetime(timestamp: u32, timezone_offset: i32, date_only: bool) -> String {
-    let mut out = [0u8; 100];
-    unsafe {
-        bitbox02_sys::util_format_datetime(
-            timestamp,
-            timezone_offset,
-            date_only,
-            out.as_mut_ptr(),
-            out.len() as _,
-        )
-    }
-    crate::util::str_from_null_terminated(&out[..])
-        .unwrap()
-        .into()
+    strftime(
+        ((timestamp as i64) + (timezone_offset as i64)) as u32,
+        if date_only {
+            "%a %Y-%m-%d"
+        } else {
+            "%a %Y-%m-%d\n%H:%M"
+        },
+    )
 }
 
 #[cfg(not(feature = "testing"))]
@@ -197,4 +196,21 @@ mod tests {
             "Mon 2020-09-28\n08:30",
         );
     }
+
+    #[test]
+    fn test_format_datetime() {
+        assert_eq!(format_datetime(1601281809, 0, true), "Mon 2020-09-28");
+        assert_eq!(
+            format_datetime(1601281809, 0, false),
+            "Mon 2020-09-28\n08:30"
+        );
+        assert_eq!(
+            format_datetime(1601281809, 18000, false),
+            "Mon 2020-09-28\n13:30"
+        );
+        assert_eq!(
+            format_datetime(1601281809, -32400, false),
+            "Sun 2020-09-27\n23:30"
+        );
+    }
 }

src/util.c

@@ -68,15 +68,3 @@ void util_cleanup_64(uint8_t** buf)
 {
     util_zero(*buf, 64);
 }
-
-void util_format_datetime(
-    uint32_t timestamp,
-    int32_t timezone_offset,
-    bool date_only,
-    char* out,
-    size_t out_size)
-{
-    time_t local_timestamp = timestamp + timezone_offset;
-    struct tm* local_time = localtime(&local_timestamp);
-    strftime(out, out_size, date_only ? "%a %Y-%m-%d" : "%a %Y-%m-%d\n%H:%M", local_time);
-}

src/util.h

@@ -145,18 +145,4 @@ typedef struct {
  */
 typedef enum { ASYNC_OP_TRUE, ASYNC_OP_FALSE, ASYNC_OP_NOT_READY } async_op_result_t;
 
-/**
- * Formats the timestamp in the local timezone.
- * @param[in] timestamp unix timestamp in seconds.
- * @param[in] timezone_offset is added to the timestamp, timezone part.
- * @param[in] date_only if true, only the date is formatted. If false, both date and time are
- * formatted.
- */
-void util_format_datetime(
-    uint32_t timestamp,
-    int32_t timezone_offset,
-    bool date_only,
-    char* out,
-    size_t out_size);
-
 #endif

test/unit-test/test_util.c

@@ -50,27 +50,10 @@ static void test_minmax(void** state)
     assert_int_not_equal(res, 5);
 }
 
-static void test_util_format_datetime(void** state)
-{
-    char out[100];
-    util_format_datetime(1601281809, 0, true, out, sizeof(out));
-    assert_string_equal(out, "Mon 2020-09-28");
-
-    util_format_datetime(1601281809, 0, false, out, sizeof(out));
-    assert_string_equal(out, "Mon 2020-09-28\n08:30");
-
-    util_format_datetime(1601281809, 18000, false, out, sizeof(out));
-    assert_string_equal(out, "Mon 2020-09-28\n13:30");
-
-    util_format_datetime(1601281809, -32400, false, out, sizeof(out));
-    assert_string_equal(out, "Sun 2020-09-27\n23:30");
-}
-
 int main(void)
 {
     const struct CMUnitTest tests[] = {
         cmocka_unit_test(test_minmax),
-        cmocka_unit_test(test_util_format_datetime),
     };
     return cmocka_run_group_tests(tests, NULL, NULL);
 }