From ead6bd250d928eb7bca2ba63bd25aa5b1f56b84c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 30 May 2018 01:07:37 +0900 Subject: [PATCH] tree-wide: fix typo in comments and NEWS --- NEWS | 2 +- src/basic/time-util.h | 2 +- src/shared/bus-util.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 5c3d5eb841..9b1fc3543d 100644 --- a/NEWS +++ b/NEWS @@ -1966,7 +1966,7 @@ CHANGES WITH 231: with future releases) that the components link to. This should decrease systemd footprint both in memory during runtime and on disk. Note that the shared library is not for public use, and is - neither API not ABI stable, but is likely to change with every new + neither API nor ABI stable, but is likely to change with every new released update. Packagers need to make sure that binaries linking to libsystemd-shared.so are updated in step with the library. diff --git a/src/basic/time-util.h b/src/basic/time-util.h index e720688c2b..f9c34a3e15 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -183,5 +183,5 @@ static inline usec_t usec_sub_signed(usec_t timestamp, int64_t delta) { /* With a 32bit time_t we can't go beyond 2038... */ #define USEC_TIMESTAMP_FORMATTABLE_MAX ((usec_t) 2147483647000000) #else -#error "Yuck, time_t is neither 4 not 8 bytes wide?" +#error "Yuck, time_t is neither 4 nor 8 bytes wide?" #endif diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 998134ec8c..a1d3ea2fb5 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -838,7 +838,7 @@ int bus_print_property(const char *name, sd_bus_message *m, bool value, bool all printf("%s=", name); /* This property has multiple space-separated values, so - * neither spaces not newlines can be allowed in a value. */ + * neither spaces nor newlines can be allowed in a value. */ good = str[strcspn(str, " \n")] == '\0'; printf("%s%s", first ? "" : " ", good ? str : "[unprintable]"); -- 2.25.1