tree-wide: assorted Coccinelle fixes

It's that time of year again.
This commit is contained in:
Frantisek Sumsal
2021-10-08 15:03:27 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent c17e8ce9ec
commit b98416e100
6 changed files with 10 additions and 10 deletions
+1 -1
View File
@@ -1596,7 +1596,7 @@ int dissect_image(
}
if (m->verity_ready)
m->verity_sig_ready = !!verity->root_hash_sig;
m->verity_sig_ready = verity->root_hash_sig;
} else if (m->partitions[verity->designator == PARTITION_USR ? PARTITION_USR_VERITY_SIG : PARTITION_ROOT_VERITY_SIG].found) {
+1 -1
View File
@@ -529,7 +529,7 @@ int fork_agent(const char *name, int except[], size_t n_except, pid_t *ret_pid,
* stdin around. */
fd = open("/dev/tty", O_WRONLY);
if (fd < 0) {
if (errno != -ENXIO) {
if (errno != ENXIO) {
log_error_errno(errno, "Failed to open /dev/tty: %m");
_exit(EXIT_FAILURE);
}
+3 -3
View File
@@ -219,9 +219,9 @@ int pkcs11_token_login_by_pin(
return log_error_errno(SYNTHETIC_ERRNO(EIO),
"Failed to log into security token '%s': %s", token_label, p11_kit_strerror(rv));
log_notice("PIN for token '%s' is incorrect, please try again.", token_label);
return -ENOLCK;
return log_notice_errno(SYNTHETIC_ERRNO(ENOLCK),
"PIN for token '%s' is incorrect, please try again.",
token_label);
}
int pkcs11_token_login(