lib/fileeq: clean up ifdefs use

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/fileeq.h b/include/fileeq.h
index 3988ed0ff683da3fc40a5950a539045d4eb2dbbd..fd290545daf7cdea1e8192bc4592b2b9750198c3 100644 (file)
--- a/include/fileeq.h
+++ b/include/fileeq.h
@@ -5,6 +5,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#if defined(__linux__) && defined(HAVE_LINUX_IF_ALG_H)
+# define USE_FILEEQ_CRYPTOAPI 1
+#endif
+
 /* Number of bytes from the beginning of the file we always
  * compare by memcmp() */
 #define UL_FILEEQ_INTROSIZ     32

diff --git a/lib/fileeq.c b/lib/fileeq.c
index d3d9aa3056789536335f1afe14aebf5f2d7f487a..d24cbb90ac6d6035fe1c6274ec18d65058223f02 100644 (file)
--- a/lib/fileeq.c
+++ b/lib/fileeq.c
@@ -43,7 +43,6 @@
 # include <linux/if_alg.h>
 # include <sys/param.h>
 # include <sys/sendfile.h>
-# define USE_HARDLINK_CRYPTOAPI        1
 #endif
 
 #include "c.h"
@@ -90,7 +89,7 @@ static const struct ul_fileeq_method ul_eq_methods[] = {
        [UL_FILEEQ_MEMCMP] = {
                .id = UL_FILEEQ_MEMCMP, .name = "memcmp"
        },
-#ifdef USE_HARDLINK_CRYPTOAPI
+#ifdef USE_FILEEQ_CRYPTOAPI
        [UL_FILEEQ_SHA1] = {
                .id = UL_FILEEQ_SHA1, .name = "sha1",
                .digsiz = 20, .kname = "sha1"
@@ -107,7 +106,7 @@ static const struct ul_fileeq_method ul_eq_methods[] = {
 #endif
 };
 
-#ifdef USE_HARDLINK_CRYPTOAPI
+#ifdef USE_FILEEQ_CRYPTOAPI
 static void deinit_crypto_api(struct ul_fileeq *eq)
 {
        if (!eq)
@@ -176,7 +175,7 @@ int ul_fileeq_init(struct ul_fileeq *eq, const char *method)
 
        if (!eq->method)
                return -1;
-#ifdef USE_HARDLINK_CRYPTOAPI
+#ifdef USE_FILEEQ_CRYPTOAPI
        if (eq->method->id != UL_FILEEQ_MEMCMP
            && init_crypto_api(eq) != 0)
                return -1;
@@ -190,7 +189,7 @@ void ul_fileeq_deinit(struct ul_fileeq *eq)
                return;
 
        DBG(EQ, ul_debugobj(eq, "deinit"));
-#ifdef USE_HARDLINK_CRYPTOAPI
+#ifdef USE_FILEEQ_CRYPTOAPI
        deinit_crypto_api(eq);
 #endif
        free(eq->buf_a);
@@ -389,7 +388,7 @@ static ssize_t read_block(struct ul_fileeq *eq, struct ul_fileeq_data *data,
        return rsz;
 }
 
-#ifdef USE_HARDLINK_CRYPTOAPI
+#ifdef USE_FILEEQ_CRYPTOAPI
 static ssize_t get_digest(struct ul_fileeq *eq, struct ul_fileeq_data *data,
                                size_t n, unsigned char **block)
 {
@@ -490,7 +489,7 @@ static ssize_t get_cmp_data(struct ul_fileeq *eq, struct ul_fileeq_data *data,
        default:
                break;
        }
-#ifdef USE_HARDLINK_CRYPTOAPI
+#ifdef USE_FILEEQ_CRYPTOAPI
        return get_digest(eq, data, blockno, block);
 #else
        return -1;