summaryrefslogtreecommitdiff
path: root/src/cryptsetup
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-11-02 09:16:47 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-11-30 20:43:25 +0100
commit294bd454701bcb41012466c8a54d8df12357e611 (patch)
tree89d8c3b12cfc39ec72474ed7162516684ba3949d /src/cryptsetup
parent40fd52f28d464d357376d8c641f5a80fdbda59a3 (diff)
downloadsystemd-294bd454701bcb41012466c8a54d8df12357e611.tar.gz
systemd-294bd454701bcb41012466c8a54d8df12357e611.tar.bz2
systemd-294bd454701bcb41012466c8a54d8df12357e611.zip
util-lib: add cleanup function for crypt_free
Diffstat (limited to 'src/cryptsetup')
-rw-r--r--src/cryptsetup/cryptsetup.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index b19d03e9f0..38468023cb 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -28,6 +28,7 @@
#include "alloc-util.h"
#include "ask-password-api.h"
+#include "crypt-util.h"
#include "device-util.h"
#include "escape.h"
#include "fileio.h"
@@ -604,7 +605,7 @@ static int help(void) {
}
int main(int argc, char *argv[]) {
- struct crypt_device *cd = NULL;
+ _cleanup_(crypt_freep) struct crypt_device *cd = NULL;
int r = -EINVAL;
if (argc <= 1) {
@@ -766,9 +767,6 @@ int main(int argc, char *argv[]) {
r = 0;
finish:
- if (cd)
- crypt_free(cd);
-
free(arg_cipher);
free(arg_hash);
free(arg_header);