diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-09-17 11:06:39 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-09-17 13:05:51 +0200 |
| commit | 8a9651088f183174a3a3409b44a7afe4d3f2cd6d (patch) | |
| tree | 52229bc64c54c18fb3ac58cc437f40ffa4370f94 | |
| parent | 72a773775d28532f318026cd3bb898154b632661 (diff) | |
| download | systemd-8a9651088f183174a3a3409b44a7afe4d3f2cd6d.tar.gz | |
various: use "-" instead of "n/a" in tables
In the context of a table, both would be generally understood to have the same
meaning. "n/a" is a strange beast. It was useful when tables were produced on
the typewriter with "---------" used to separate rows. It is visually more
pleasing to use "-", and there is no risk of it being mistaken for a row
separator.
| -rw-r--r-- | man/coredumpctl.xml | 6 | ||||
| -rw-r--r-- | man/systemctl.xml | 2 | ||||
| -rw-r--r-- | src/shared/format-table.c | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/man/coredumpctl.xml b/man/coredumpctl.xml index 2a1f654112..903565764e 100644 --- a/man/coredumpctl.xml +++ b/man/coredumpctl.xml @@ -334,9 +334,9 @@ <title>List all the core dumps of a program</title> <programlisting>$ coredumpctl list /usr/lib64/firefox/firefox -TIME PID UID GID SIG COREFILE EXE SIZE -Tue … 8018 1000 1000 SIGSEGV missing /usr/lib64/firefox/firefox n/a -Wed … 251609 1000 1000 SIGTRAP missing /usr/lib64/firefox/firefox n/a +TIME PID UID GID SIG COREFILE EXE SIZE +Tue … 8018 1000 1000 SIGSEGV missing /usr/lib64/firefox/firefox - +Wed … 251609 1000 1000 SIGTRAP missing /usr/lib64/firefox/firefox - Fri … 552351 1000 1000 SIGSEGV present /usr/lib64/firefox/firefox 28.7M </programlisting> diff --git a/man/systemctl.xml b/man/systemctl.xml index 5c0e743d81..a7cd6398af 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -159,7 +159,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service Produces output similar to <programlisting> NEXT LEFT LAST PASSED UNIT ACTIVATES -n/a n/a Thu 2017-02-23 13:40:29 EST 3 days ago ureadahead-stop.timer ureadahead-stop.service +- - Thu 2017-02-23 13:40:29 EST 3 days ago ureadahead-stop.timer ureadahead-stop.service Sun 2017-02-26 18:55:42 EST 1min 14s left Thu 2017-02-23 13:54:44 EST 3 days ago systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.service Sun 2017-02-26 20:37:16 EST 1h 42min left Sun 2017-02-26 11:56:36 EST 6h ago apt-daily.timer apt-daily.service Sun 2017-02-26 20:57:49 EST 2h 3min left Sun 2017-02-26 11:56:36 EST 6h ago snapd.refresh.timer snapd.refresh.service diff --git a/src/shared/format-table.c b/src/shared/format-table.c index d4e66cb6a4..47bc90b9fc 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c @@ -1464,7 +1464,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas else ret = format_timestamp_relative(p, FORMAT_TIMESTAMP_RELATIVE_MAX, d->timestamp); if (!ret) - return "n/a"; + return "-"; d->formatted = TAKE_PTR(p); break; @@ -1480,7 +1480,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas if (!format_timespan(p, FORMAT_TIMESPAN_MAX, d->timespan, d->type == TABLE_TIMESPAN ? 0 : USEC_PER_MSEC)) - return "n/a"; + return "-"; d->formatted = TAKE_PTR(p); break; @@ -1494,7 +1494,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas return NULL; if (!format_bytes(p, FORMAT_BYTES_MAX, d->size)) - return "n/a"; + return "-"; d->formatted = TAKE_PTR(p); break; @@ -1509,7 +1509,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas return NULL; if (!format_bytes_full(p, FORMAT_BYTES_MAX, d->size, 0)) - return "n/a"; + return "-"; n = strlen(p); strscpy(p + n, FORMAT_BYTES_MAX + 2 - n, "bps"); @@ -1710,7 +1710,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas char *p; if (!uid_is_valid(d->uid)) - return "n/a"; + return "-"; p = new(char, DECIMAL_STR_WIDTH(d->uid) + 1); if (!p) @@ -1725,7 +1725,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas char *p; if (!gid_is_valid(d->gid)) - return "n/a"; + return "-"; p = new(char, DECIMAL_STR_WIDTH(d->gid) + 1); if (!p) @@ -1740,7 +1740,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas char *p; if (!pid_is_valid(d->pid)) - return "n/a"; + return "-"; p = new(char, DECIMAL_STR_WIDTH(d->pid) + 1); if (!p) @@ -1757,7 +1757,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas suffix = signal_to_string(d->int_val); if (!suffix) - return "n/a"; + return "-"; p = strjoin("SIG", suffix); if (!p) @@ -1771,7 +1771,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas char *p; if (d->mode == MODE_INVALID) - return "n/a"; + return "-"; p = new(char, 4 + 1); if (!p) |