summaryrefslogtreecommitdiff
path: root/src/cryptsetup/cryptsetup.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-28 11:58:34 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-28 12:04:41 +0100
commit0a1beeb64207eaa88ab9236787b1cbc2f704ae14 (patch)
tree50117277be2e2078d0373b944a30b4f09bb94443 /src/cryptsetup/cryptsetup.c
parentb4d23205f238e06aaa31264628e20669e714acad (diff)
treewide: auto-convert the simple cases to log_*_errno()
As a followup to 086891e5c1 "log: add an "error" parameter to all low-level logging calls and intrdouce log_error_errno() as log calls that take error numbers", use sed to convert the simple cases to use the new macros: find . -name '*.[ch]' | xargs sed -r -i -e \ 's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/' Multi-line log_*() invocations are not covered. And we also should add log_unit_*_errno().
Diffstat (limited to 'src/cryptsetup/cryptsetup.c')
-rw-r--r--src/cryptsetup/cryptsetup.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index b9e67fa63b..4afe53138f 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -281,7 +281,7 @@ static int get_password(const char *name, usec_t until, bool accept_cached, char
r = ask_password_auto(text, "drive-harddisk", id, until, accept_cached, passwords);
if (r < 0) {
- log_error("Failed to query password: %s", strerror(-r));
+ log_error_errno(-r, "Failed to query password: %m");
return r;
}
@@ -297,7 +297,7 @@ static int get_password(const char *name, usec_t until, bool accept_cached, char
r = ask_password_auto(text, "drive-harddisk", id, until, false, &passwords2);
if (r < 0) {
- log_error("Failed to query verification password: %s", strerror(-r));
+ log_error_errno(-r, "Failed to query verification password: %m");
return r;
}
@@ -355,7 +355,7 @@ static int attach_tcrypt(struct crypt_device *cd,
if (key_file) {
r = read_one_line_file(key_file, &passphrase);
if (r < 0) {
- log_error("Failed to read password file '%s': %s", key_file, strerror(-r));
+ log_error_errno(-r, "Failed to read password file '%s': %m", key_file);
return -EAGAIN;
}
@@ -439,7 +439,7 @@ static int attach_luks_or_plain(struct crypt_device *cd,
}
if (r < 0) {
- log_error("Loading of cryptographic parameters failed: %s", strerror(-r));
+ log_error_errno(-r, "Loading of cryptographic parameters failed: %m");
return r;
}
@@ -454,7 +454,7 @@ static int attach_luks_or_plain(struct crypt_device *cd,
key_file, arg_keyfile_size,
arg_keyfile_offset, flags);
if (r < 0) {
- log_error("Failed to activate with key file '%s': %s", key_file, strerror(-r));
+ log_error_errno(-r, "Failed to activate with key file '%s': %m", key_file);
return -EAGAIN;
}
} else {
@@ -567,7 +567,7 @@ int main(int argc, char *argv[]) {
k = crypt_init(&cd, argv[3]);
if (k) {
- log_error("crypt_init() failed: %s", strerror(-k));
+ log_error_errno(-k, "crypt_init() failed: %m");
goto finish;
}
@@ -623,7 +623,7 @@ int main(int argc, char *argv[]) {
key_file = NULL;
continue;
} else if (k != -EPERM) {
- log_error("Failed to activate: %s", strerror(-k));
+ log_error_errno(-k, "Failed to activate: %m");
goto finish;
}
@@ -641,7 +641,7 @@ int main(int argc, char *argv[]) {
k = crypt_init_by_name(&cd, argv[2]);
if (k) {
- log_error("crypt_init() failed: %s", strerror(-k));
+ log_error_errno(-k, "crypt_init() failed: %m");
goto finish;
}
@@ -649,7 +649,7 @@ int main(int argc, char *argv[]) {
k = crypt_deactivate(cd, argv[2]);
if (k < 0) {
- log_error("Failed to deactivate: %s", strerror(-k));
+ log_error_errno(-k, "Failed to deactivate: %m");
goto finish;
}