From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 14 Oct 2022 12:42:37 +0000 (+0200)
Subject: cryptsetup: use errno-flavoured logging where we have an errno
X-Git-Tag: v252-rc2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6fd88a5117e23fbacfe26ff43028b8d70c6903d;p=thirdparty%2Fsystemd.git

cryptsetup: use errno-flavoured logging where we have an errno
---

diff --git a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c
index 7e958a4db58..abe80720afe 100644
--- a/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c
+++ b/src/cryptsetup/cryptsetup-tokens/cryptsetup-token-systemd-tpm2.c
@@ -24,13 +24,10 @@ _public_ const char *cryptsetup_token_version(void) {
 }
 
 static int log_debug_open_error(struct crypt_device *cd, int r) {
-        if (r == -EAGAIN) {
-                crypt_log_debug(cd, "TPM2 device not found.");
-                return r;
-        } else if (r == -ENXIO) {
-                crypt_log_debug(cd, "No matching TPM2 token data found.");
-                return r;
-        }
+        if (r == -EAGAIN)
+                return crypt_log_debug_errno(cd, r, "TPM2 device not found.");
+        if (r == -ENXIO)
+                return crypt_log_debug_errno(cd, r, "No matching TPM2 token data found.");
 
         return crypt_log_debug_errno(cd, r, TOKEN_NAME " open failed: %m.");
 }