From fe4175b551f9f5df2ba53adaec9dc67e3a8da23e Mon Sep 17 00:00:00 2001
From: Milan Broz <gmazyland@gmail.com>
Date: Thu, 10 Jan 2013 17:26:19 +0100
Subject: [PATCH] Fix some extended compile warning.

---
 lib/crypto_backend/crypto_cipher_kernel.c | 3 +++
 lib/luks1/keyencryption.c                 | 1 +
 lib/utils_devpath.c                       | 5 -----
 lib/utils_dm.h                            | 5 +++++
 src/cryptsetup.c                          | 2 +-
 src/cryptsetup.h                          | 1 +
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/crypto_backend/crypto_cipher_kernel.c b/lib/crypto_backend/crypto_cipher_kernel.c
index 3bda80a1..2dd65953 100644
--- a/lib/crypto_backend/crypto_cipher_kernel.c
+++ b/lib/crypto_backend/crypto_cipher_kernel.c
@@ -44,6 +44,9 @@ struct crypt_cipher {
 	int opfd;
 };
 
+/* Shared with hash kernel backend */
+int crypt_kernel_socket_init(struct sockaddr_alg *sa, int *tfmfd, int *opfd);
+
 int crypt_kernel_socket_init(struct sockaddr_alg *sa, int *tfmfd, int *opfd)
 {
 	*tfmfd = socket(AF_ALG, SOCK_SEQPACKET, 0);
diff --git a/lib/luks1/keyencryption.c b/lib/luks1/keyencryption.c
index 7a3dc2fd..de1b553d 100644
--- a/lib/luks1/keyencryption.c
+++ b/lib/luks1/keyencryption.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
+#include "luks.h"
 #include "internal.h"
 
 static void _error_hint(struct crypt_device *ctx, const char *device,
diff --git a/lib/utils_devpath.c b/lib/utils_devpath.c
index d1e87353..7e872ad6 100644
--- a/lib/utils_devpath.c
+++ b/lib/utils_devpath.c
@@ -32,11 +32,6 @@
 #include <sys/types.h>
 #include "utils_dm.h"
 
-/* These are DM helpers used only by this file */
-int dm_is_dm_device(int major, int minor);
-int dm_is_dm_kernel_name(const char *name);
-char *dm_device_path(const char *prefix, int major, int minor);
-
 char *crypt_lookup_dev(const char *dev_id);
 int crypt_sysfs_get_rotational(int major, int minor, int *rotational);
 
diff --git a/lib/utils_dm.h b/lib/utils_dm.h
index ae4836cd..63e972bd 100644
--- a/lib/utils_dm.h
+++ b/lib/utils_dm.h
@@ -100,4 +100,9 @@ int dm_resume_and_reinstate_key(struct crypt_device *cd, const char *name,
 
 const char *dm_get_dir(void);
 
+/* These are DM helpers used only by utils_devpath file */
+int dm_is_dm_device(int major, int minor);
+int dm_is_dm_kernel_name(const char *name);
+char *dm_device_path(const char *prefix, int major, int minor);
+
 #endif /* _UTILS_DM_H */
diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index bb429f10..86337dc3 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -475,7 +475,7 @@ static int action_benchmark(void)
 		{ "twofish", "xts", 64, 16 },
 		{  NULL, NULL, 0, 0 }
 	};
-	static char *bkdfs[] = {
+	static const char *bkdfs[] = {
 		"sha1", "sha256", "sha512", "ripemd160", "whirlpool", NULL
 	};
 	char cipher[MAX_CIPHER_LEN], cipher_mode[MAX_CIPHER_LEN];
diff --git a/src/cryptsetup.h b/src/cryptsetup.h
index c9a40b8c..9d4e78af 100644
--- a/src/cryptsetup.h
+++ b/src/cryptsetup.h
@@ -69,6 +69,7 @@ void quiet_log(int level, const char *msg, void *usrptr);
 int yesDialog(const char *msg, void *usrptr __attribute__((unused)));
 void show_status(int errcode);
 const char *uuid_or_device(const char *spec);
+__attribute__ ((noreturn)) \
 void usage(poptContext popt_context, int exitcode, const char *error, const char *more);
 void dbg_version_and_cmd(int argc, const char **argv);
 int translate_errno(int r);