Do not use kernel dm-ioctl header directly and remove warnings.

Add alignment test to distributed files.
Fix write() return compiler warning.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@202 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c
index 3324162..d4e9974 100644 (file)
--- a/lib/libdevmapper.c
+++ b/lib/libdevmapper.c
@@ -1,11 +1,7 @@
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <libdevmapper.h>
-#include <linux/dm-ioctl.h>
 #include <fcntl.h>
 #include <linux/fs.h>
 #include <uuid/uuid.h>
@@ -14,6 +10,7 @@
 #include "luks.h"
 
 #define DEVICE_DIR             "/dev"
+#define DM_UUID_LEN            129
 #define DM_UUID_PREFIX         "CRYPT-"
 #define DM_UUID_PREFIX_LEN     6
 #define DM_CRYPT_TARGET                "crypt"

diff --git a/lib/utils.c b/lib/utils.c
index 9893056..b39a840 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -371,8 +371,8 @@ static int interactive_pass(const char *prompt, char *pass, size_t maxlen,
        tcsetattr(infd, TCSAFLUSH, &orig);
 
 out_err:
-       if (!failed)
-               (void)write(outfd, "\n", 1);
+       if (!failed && write(outfd, "\n", 1));
+
        if (infd != STDIN_FILENO)
                close(infd);
        return failed;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ea413ba..696dd32 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 TESTS = apitest
 
-EXTRA_DIST = fileDiffer.py compatimage.img.bz2
+EXTRA_DIST = fileDiffer.py compatimage.img.bz2 align_test
 
 apitest_SOURCES = apitest.c
 apitest_LDADD = ../lib/libcryptsetup.la