Move defines from header.

diff --git a/lib/setup.c b/lib/setup.c
index bcd22df..ae7fc44 100644 (file)
--- a/lib/setup.c
+++ b/lib/setup.c
@@ -1141,7 +1141,6 @@ int crypt_format(struct crypt_device *cd,
        else if (isVERITY(type))
                r = _crypt_format_verity(cd, uuid, params);
        else {
-               /* FIXME: allow plugins here? */
                log_err(cd, _("Unknown crypt device type %s requested.\n"), type);
                r = -EINVAL;
        }

diff --git a/lib/verity/verity.c b/lib/verity/verity.c
index 7cfb811..f9fbe81 100644 (file)
--- a/lib/verity/verity.c
+++ b/lib/verity/verity.c
@@ -32,6 +32,8 @@
 #include "verity.h"
 #include "internal.h"
 
+#define VERITY_SIGNATURE "verity\0\0"
+
 #define NEW_SB 1
 
 #ifndef NEW_SB

diff --git a/lib/verity/verity.h b/lib/verity/verity.h
index 273739b..e37ed76 100644 (file)
--- a/lib/verity/verity.h
+++ b/lib/verity/verity.h
@@ -23,9 +23,6 @@
 #include <unistd.h>
 #include "config.h"
 
-#define VERITY_SIGNATURE       "verity\0\0"
-#define VERITY_MAX_LEVELS      63
-
 struct crypt_device;
 struct crypt_params_verity;
 

diff --git a/lib/verity/verity_hash.c b/lib/verity/verity_hash.c
index e7ef93d..0e2c48c 100644 (file)
--- a/lib/verity/verity_hash.c
+++ b/lib/verity/verity_hash.c
@@ -26,6 +26,8 @@
 #include "verity.h"
 #include "internal.h"
 
+#define VERITY_MAX_LEVELS      63
+
 static unsigned get_bits_up(size_t u)
 {
        unsigned i = 0;

diff --git a/src/veritysetup.c b/src/veritysetup.c
index eb5ec0d..bb437b2 100644 (file)
--- a/src/veritysetup.c
+++ b/src/veritysetup.c
@@ -31,7 +31,7 @@
 
 #define PACKAGE_VERITY "veritysetup"
 
-static int use_superblock = 1; /* FIXME: no superblock not supported */
+static int use_superblock = 1;
 
 static const char *hash_algorithm = NULL;
 static int hash_type = 1;