summaryrefslogtreecommitdiff
path: root/src/test/test-time-util.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-05-24 09:36:56 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-05-31 14:30:23 +0200
commit4d9685be5f9174d38f87a2e6ab1a4bca72639774 (patch)
treeab9354a4b1e01634eb341221550e294e7778a1df /src/test/test-time-util.c
parentd3d280242cc9cdfaf0184860029ddd738b6fa952 (diff)
downloadsystemd-4d9685be5f9174d38f87a2e6ab1a4bca72639774.tar.gz
Use const char* for timestamp strings which we don't plan to modify
Makes the intent a bit clearer.
Diffstat (limited to 'src/test/test-time-util.c')
-rw-r--r--src/test/test-time-util.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
index ab4b7ce282..00d583182d 100644
--- a/src/test/test-time-util.c
+++ b/src/test/test-time-util.c
@@ -120,18 +120,16 @@ static void test_parse_nsec(void) {
}
static void test_format_timespan_one(usec_t x, usec_t accuracy) {
- char *r;
char l[FORMAT_TIMESPAN_MAX];
+ const char *t;
usec_t y;
log_info(USEC_FMT" (at accuracy "USEC_FMT")", x, accuracy);
- r = format_timespan(l, sizeof(l), x, accuracy);
- assert_se(r);
+ assert_se(t = format_timespan(l, sizeof l, x, accuracy));
+ log_info(" = <%s>", t);
- log_info(" = <%s>", l);
-
- assert_se(parse_sec(l, &y) >= 0);
+ assert_se(parse_sec(t, &y) >= 0);
log_info(" = "USEC_FMT, y);
@@ -271,13 +269,12 @@ static void test_format_timestamp(void) {
}
}
-static void test_format_timestamp_utc_one(usec_t t, const char *result) {
+static void test_format_timestamp_utc_one(usec_t val, const char *result) {
char buf[FORMAT_TIMESTAMP_MAX];
+ const char *t;
- assert_se(!format_timestamp_utc(buf, sizeof(buf), t) == !result);
-
- if (result)
- assert_se(streq(result, buf));
+ t = format_timestamp_utc(buf, sizeof(buf), val);
+ assert_se(streq_ptr(t, result));
}
static void test_format_timestamp_utc(void) {