dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24708 from keszybz/not-available-in-tables

Browse Source 
various: use "-" instead of "n/a" in tables
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-09-17 18:16:42 +02:00
committed by GitHub
parent 15b3f7e309 7f8afa6dc1
commit eb5b6b7310
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
man/coredumpctl.xml
View File

@@ -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>
@@ -380,7 +380,7 @@ Fri … 552351 1000 1000 SIGSEGV present /usr/lib64/firefox/firefox 28.7M
Machine ID: …
Hostname: …
Storage: /var/lib/systemd/coredump/core.bash.1000.….zst (present)
Disk Size: 51.7K
Size on Disk: 51.7K
Message: Process 130414 (bash) of user 1000 dumped core.
Stack trace of thread 130414:

2
man/systemctl.xml
View File

@@ -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

2
src/coredump/coredumpctl.c
View File

@@ -717,7 +717,7 @@ static int print_info(FILE *file, sd_journal *j, bool need_space) {
ansi_normal());
if (size != UINT64_MAX)
fprintf(file, " Disk Size: %s\n", FORMAT_BYTES(size));
fprintf(file, " Size on Disk: %s\n", FORMAT_BYTES(size));
} else if (coredump)
fprintf(file, " Storage: journal\n");

18
src/shared/format-table.c
View File

@@ -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)