1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
From efb85ed5707ffb0a1ca0957b2349971f28fb2270 Mon Sep 17 00:00:00 2001
From: Tim Stack <timothyshanestack@gmail.com>
Date: Thu, 9 May 2024 15:41:30 -0700
Subject: [PATCH] [tests] try to address some test issues
---
src/base/humanize.time.cc | 9 +++++----
src/lnav_commands.cc | 10 ++--------
src/third-party/rapidyaml/ryml_all.hpp | 5 +++++
test/test_cmds.sh | 3 +++
4 files changed, 15 insertions(+), 12 deletions(-)
--- a/src/base/humanize.time.cc
+++ b/src/base/humanize.time.cc
@@ -57,8 +57,9 @@ point::as_time_ago() const
current_time.tv_sec = convert_log_time_to_local(current_time.tv_sec);
}
- auto delta
- = std::chrono::seconds(current_time.tv_sec - this->p_past_point.tv_sec);
+ auto curr_secs = std::chrono::seconds(current_time.tv_sec);
+ auto past_secs = std::chrono::seconds(this->p_past_point.tv_sec);
+ auto delta = curr_secs - past_secs;
if (delta < 0s) {
return "in the future";
}
@@ -113,8 +114,8 @@ point::as_precise_time_ago() const
return fmt::format(FMT_STRING("{:2} seconds ago"), diff.tv_sec);
}
- time_t seconds = diff.tv_sec % 60;
- time_t minutes = diff.tv_sec / 60;
+ lnav::time64_t seconds = diff.tv_sec % 60;
+ lnav::time64_t minutes = diff.tv_sec / 60;
return fmt::format(FMT_STRING("{:2} minute{} and {:2} second{} ago"),
minutes,
--- a/src/lnav_commands.cc
+++ b/src/lnav_commands.cc
@@ -316,15 +316,12 @@ com_unix_time(exec_context& ec,
}
if (parsed) {
char ftime[128];
- int len;
strftime(ftime,
sizeof(ftime),
"%a %b %d %H:%M:%S %Y %z %Z",
localtime_r(&u_time, &log_time));
- len = strlen(ftime);
- snprintf(ftime + len, sizeof(ftime) - len, " -- %ld", u_time);
- retval = std::string(ftime);
+ retval = fmt::format(FMT_STRING("{} -- {}"), ftime, u_time);
} else {
return ec.make_error("invalid unix time -- {}", args[1]);
}
@@ -659,7 +656,6 @@ com_current_time(exec_context& ec,
struct tm localtm;
std::string retval;
time_t u_time;
- size_t len;
memset(&localtm, 0, sizeof(localtm));
u_time = time(nullptr);
@@ -667,9 +663,7 @@ com_current_time(exec_context& ec,
sizeof(ftime),
"%a %b %d %H:%M:%S %Y %z %Z",
localtime_r(&u_time, &localtm));
- len = strlen(ftime);
- snprintf(ftime + len, sizeof(ftime) - len, " -- %ld", u_time);
- retval = std::string(ftime);
+ retval = fmt::format(FMT_STRING("{} -- {}"), ftime, u_time);
return Ok(retval);
}
--- a/src/third-party/rapidyaml/ryml_all.hpp
+++ b/src/third-party/rapidyaml/ryml_all.hpp
@@ -498,6 +498,11 @@ C4_FOR_EACH(PRN_STRUCT_OFFSETS, a, b, c)
#endif
#define C4_BYTE_ORDER _C4EL
+#elif defined(mips) || defined(__mips__) || defined(__mips)
+
+ #define C4_WORDSIZE 8
+ #define C4_BYTE_ORDER _C4EL
+
#elif defined(__EMSCRIPTEN__)
# define C4_BYTE_ORDER _C4EL
# define C4_WORDSIZE 4
|
