From: Yu Watanabe Date: Tue, 29 May 2018 16:07:37 +0000 (+0900) Subject: tree-wide: fix typo in comments and NEWS X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=eceacef8b86634720a035f7b445f85dcf41961b7;p=elogind.git tree-wide: fix typo in comments and NEWS --- diff --git a/NEWS b/NEWS index cd7c22961..d94c2241b 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 1662197d6..fec051109 100644 --- a/src/basic/time-util.h +++ b/src/basic/time-util.h @@ -207,5 +207,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 cf9c8eb0d..4f66bb3b7 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -842,7 +842,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]");