From 2d50b0d08eeee88c8277e9ee8d1ea2976f558366 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 11 Mar 2020 13:25:36 +0100 Subject: [PATCH] analyze: fix table time output --- .../analyze-fix-table-time-output.patch | 97 +++++++++++++++++++ ...daemon-for-inter-fsckd-communication.patch | 2 +- debian/patches/series | 1 + 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 debian/patches/analyze-fix-table-time-output.patch diff --git a/debian/patches/analyze-fix-table-time-output.patch b/debian/patches/analyze-fix-table-time-output.patch new file mode 100644 index 000000000..3e10bb1e0 --- /dev/null +++ b/debian/patches/analyze-fix-table-time-output.patch @@ -0,0 +1,97 @@ +From: Haochen Tong +Date: Mon, 9 Mar 2020 10:43:09 +0100 +Subject: analyze: fix table time output + +(cherry picked from commit 47cc458e97a3825d57462bad2ee854903364512e) +(cherry picked from commit 084df9c616fdfbcbf3d7fbe7dc6b975f1fa359d2) +--- + src/analyze/analyze.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c +index 217e7e1..3ea9041 100644 +--- a/src/analyze/analyze.c ++++ b/src/analyze/analyze.c +@@ -1114,7 +1114,7 @@ static int analyze_blame(int argc, char *argv[], void *userdata) { + continue; + + r = table_add_many(table, +- TABLE_TIMESPAN_MSEC, &u->time, ++ TABLE_TIMESPAN_MSEC, u->time, + TABLE_STRING, u->name); + if (r < 0) + return table_log_add_error(r); +@@ -1862,9 +1862,9 @@ static int dump_timespan(int argc, char *argv[], void *userdata) { + return table_log_add_error(r); + + r = table_add_many(table, +- TABLE_UINT64, &output_usecs, ++ TABLE_UINT64, output_usecs, + TABLE_STRING, "Human:", +- TABLE_TIMESPAN, &output_usecs, ++ TABLE_TIMESPAN, output_usecs, + TABLE_SET_COLOR, ansi_highlight()); + if (r < 0) + return table_log_add_error(r); +@@ -1917,7 +1917,7 @@ static int test_timestamp_one(const char *p) { + TABLE_STRING, "Original form:", + TABLE_STRING, p, + TABLE_STRING, "Normalized form:", +- TABLE_TIMESTAMP, &usec, ++ TABLE_TIMESTAMP, usec, + TABLE_SET_COLOR, ansi_highlight_blue()); + if (r < 0) + return table_log_add_error(r); +@@ -1925,7 +1925,7 @@ static int test_timestamp_one(const char *p) { + if (!in_utc_timezone()) { + r = table_add_many(table, + TABLE_STRING, "(in UTC):", +- TABLE_TIMESTAMP_UTC, &usec); ++ TABLE_TIMESTAMP_UTC, usec); + if (r < 0) + return table_log_add_error(r); + } +@@ -1946,7 +1946,7 @@ static int test_timestamp_one(const char *p) { + + r = table_add_many(table, + TABLE_STRING, "From now:", +- TABLE_TIMESTAMP_RELATIVE, &usec); ++ TABLE_TIMESTAMP_RELATIVE, usec); + if (r < 0) + return table_log_add_error(r); + +@@ -2042,7 +2042,7 @@ static int test_calendar_one(usec_t n, const char *p) { + if (i == 0) { + r = table_add_many(table, + TABLE_STRING, "Next elapse:", +- TABLE_TIMESTAMP, &next, ++ TABLE_TIMESTAMP, next, + TABLE_SET_COLOR, ansi_highlight_blue()); + if (r < 0) + return table_log_add_error(r); +@@ -2059,7 +2059,7 @@ static int test_calendar_one(usec_t n, const char *p) { + return table_log_add_error(r); + + r = table_add_many(table, +- TABLE_TIMESTAMP, &next, ++ TABLE_TIMESTAMP, next, + TABLE_SET_COLOR, ansi_highlight_blue()); + if (r < 0) + return table_log_add_error(r); +@@ -2068,14 +2068,14 @@ static int test_calendar_one(usec_t n, const char *p) { + if (!in_utc_timezone()) { + r = table_add_many(table, + TABLE_STRING, "(in UTC):", +- TABLE_TIMESTAMP_UTC, &next); ++ TABLE_TIMESTAMP_UTC, next); + if (r < 0) + return table_log_add_error(r); + } + + r = table_add_many(table, + TABLE_STRING, "From now:", +- TABLE_TIMESTAMP_RELATIVE, &next); ++ TABLE_TIMESTAMP_RELATIVE, next); + if (r < 0) + return table_log_add_error(r); + diff --git a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch index 76ca67b0c..3fc6e50fb 100644 --- a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch +++ b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch @@ -1000,7 +1000,7 @@ index 042081c..bea6c16 100644 [Service] diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in -index 33220835..bfa565b 100644 +index 3322083..bfa565b 100644 --- a/units/systemd-fsck@.service.in +++ b/units/systemd-fsck@.service.in @@ -13,7 +13,8 @@ Documentation=man:systemd-fsck@.service(8) diff --git a/debian/patches/series b/debian/patches/series index de1e4ced1..0f9e47112 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +analyze-fix-table-time-output.patch debian/Use-Debian-specific-config-files.patch debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch debian/Make-run-lock-tmpfs-an-API-fs.patch