diff options
| author | Milan Broz <gmazyland@gmail.com> | 2013-08-04 18:36:09 +0200 |
|---|---|---|
| committer | Milan Broz <gmazyland@gmail.com> | 2013-08-04 19:01:55 +0200 |
| commit | b2283f045a36631817df5d3cfb1b271ca432f930 (patch) | |
| tree | 93b623404fa7d258aa451b596bb3e108bafe71b9 | |
| parent | 8e3863aa205e400b9d5d99685532995eb1b68964 (diff) | |
| download | cryptsetup-b2283f045a36631817df5d3cfb1b271ca432f930.tar.gz cryptsetup-b2283f045a36631817df5d3cfb1b271ca432f930.tar.bz2 cryptsetup-b2283f045a36631817df5d3cfb1b271ca432f930.zip | |
Version 1.6.2.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/utils_devpath.c | 5 | ||||
| -rw-r--r-- | tests/api-test.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 325735d..3caef1d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.67]) -AC_INIT([cryptsetup],[1.6.2-git]) +AC_INIT([cryptsetup],[1.6.2]) dnl library version from <major>.<minor>.<release>[-<suffix>] LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-) diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c index 7007f18..e08a87c 100644 --- a/lib/utils_devpath.c +++ b/lib/utils_devpath.c @@ -31,10 +31,7 @@ #include <limits.h> #include <sys/stat.h> #include <sys/types.h> -#include "utils_dm.h" - -char *crypt_lookup_dev(const char *dev_id); -int crypt_sysfs_get_rotational(int major, int minor, int *rotational); +#include "internal.h" static char *__lookup_dev(char *path, dev_t dev, int dir_level, const int max_level) { diff --git a/tests/api-test.c b/tests/api-test.c index b359ca1..5607f8d 100644 --- a/tests/api-test.c +++ b/tests/api-test.c @@ -538,8 +538,8 @@ static void xlog(const char *msg, const char *tst, const char *func, int line, c #define FAIL_(x, y) do { xlog("(fail) ", #x, __FUNCTION__, __LINE__, y); \ check_ko((x), __LINE__, __FUNCTION__); \ } while(0) -#define EQ_(x, y) do { xlog("(equal) ", #x " == " #y, __FUNCTION__, __LINE__, NULL); \ - int64_t _x = (x), _y = (y); \ +#define EQ_(x, y) do { int64_t _x = (x), _y = (y); \ + xlog("(equal) ", #x " == " #y, __FUNCTION__, __LINE__, NULL); \ if (_x != _y) check_equal(__LINE__, __FUNCTION__, _x, _y); \ } while(0) #define RUN_(x, y) do { printf("%s: %s\n", #x, (y)); x(); } while (0) |