Merge branch 'upstream' into tizen

[platform/upstream/cryptsetup.git] / src / utils_tools.c

diff --git a/src/utils_tools.c b/src/utils_tools.c
index 47bcfe1..390590a 100644 (file)
--- a/src/utils_tools.c
+++ b/src/utils_tools.c
@@ -3,8 +3,8 @@
  *
  * Copyright (C) 2004 Jana Saout <jana@saout.de>
  * Copyright (C) 2004-2007 Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2009-2020 Red Hat, Inc. All rights reserved.
- * Copyright (C) 2009-2020 Milan Broz
+ * Copyright (C) 2009-2021 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-2021 Milan Broz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -238,6 +238,7 @@ __attribute__ ((noreturn)) void usage(poptContext popt_context,
        poptPrintUsage(popt_context, stderr, 0);
        if (error)
                log_err("%s: %s", more, error);
+       tools_cleanup();
        poptFreeContext(popt_context);
        exit(exitcode);
 }
@@ -596,14 +597,6 @@ out:
        return r;
 }
 
-int tools_is_cipher_null(const char *cipher)
-{
-       if (!cipher)
-               return 0;
-
-       return !strcmp(cipher, "cipher_null") ? 1 : 0;
-}
-
 /*
  * Keyfile - is standard input treated as a binary file (no EOL handling).
  */