mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
fix: ambiguity in log_sys_error call from previous commit
libdm-common.c:883:42: warning: pointer/integer type mismatch in conditional expression define log_sys_error(x, y) log_err("%s%s%s failed: %s", y, *y ? ": " : "", x, strerror(errno)) So the "y" which was 'path ? : "SELinux context reset"' from previous commit did not quite fit the other "? :" in the log_sys_macro.
This commit is contained in:
parent
0563bd0037
commit
f1dc4d3d81
@ -880,7 +880,7 @@ int dm_prepare_selinux_context(const char *path, mode_t mode)
|
|||||||
log_debug_activation("Resetting SELinux context to default value.");
|
log_debug_activation("Resetting SELinux context to default value.");
|
||||||
|
|
||||||
if (setfscreatecon(scontext) < 0) {
|
if (setfscreatecon(scontext) < 0) {
|
||||||
log_sys_error("setfscreatecon", path ? : "SELinux context reset");
|
log_sys_error("setfscreatecon", (path ? : "SELinux context reset"));
|
||||||
freecon(scontext);
|
freecon(scontext);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user