mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 18:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

sd-id128: return -ENOMEDIUM on null id

Browse Source 
We currently return -ENOMEDIUM when /etc/machine-id is empty, and -EINVAL when
it is all zeros. But -EINVAL is also used for invalid args. The distinction
between empty and all-zero is not very important, let's use the same return
code.

Also document -ENOENT and -ENOMEDIUM since they can be a bit surprising.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-05-16 13:55:12 +02:00
parent 63e2ebcdaa
commit ea03f6ba0d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
man/sd_id128_get_machine.xml
View File

@ -116,9 +116,11 @@
<refsect1>
<title>Return Value</title>
<para>The two calls return 0 on success (in which case
<parameter>ret</parameter> is filled in), or a negative
errno-style error code.</para>
<para>Those calls return 0 on success (in which case <parameter>ret</parameter> is filled in),
or a negative errno-style error code. In particular, <function>sd_id128_get_machine()</function>
and <function>sd_id128_get_machine_app_specific()</function> return <constant>-ENOENT</constant>
if <filename>/etc/machine-id</filename> is missing, and <constant>-ENOMEDIUM</constant> if is
empty or all zeros.</para>
</refsect1>
<refsect1>

2
src/libsystemd/sd-id128/sd-id128.c
View File

@ -98,7 +98,7 @@ _public_ int sd_id128_get_machine(sd_id128_t *ret) {
return r;
if (sd_id128_is_null(saved_machine_id))
return -EINVAL;
return -ENOMEDIUM;
}
*ret = saved_machine_id;