picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gpt-auto-generator: allow type check to fail

Browse source 
add_mount() is OK with unknow file type, but we have to initalize
the variable to NULL not to pass garbage on error.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-03-13 21:10:13 -05:00
parent 7c5925a448
commit a0b1209c4a
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gpt-auto-generator/gpt-auto-generator.c
View file

@ -288,7 +288,7 @@ static int probe_and_add_mount(
const char *post) {
_cleanup_blkid_free_probe_ blkid_probe b = NULL;
const char *fstype;
const char *fstype = NULL;
int r;
assert(id);
@ -321,14 +321,11 @@ static int probe_and_add_mount(
r = blkid_do_safeprobe(b);
if (r == -2 || r == 1) /* no result or uncertain */
return 0;
else if (r != 0) {
if (errno == 0)
errno = EIO;
log_error_errno(errno, "Failed to probe %s: %m", what);
return -errno;
}
else if (r != 0)
return log_error_errno(errno ?: EIO, "Failed to probe %s: %m", what);
blkid_probe_lookup_value(b, "TYPE", &fstype, NULL);
/* add_mount is OK with fstype being NULL. */
(void) blkid_probe_lookup_value(b, "TYPE", &fstype, NULL);
return add_mount(
id,