Imported Upstream version 1.6.7

[platform/upstream/cryptsetup.git] / src / cryptsetup.h

diff --git a/src/cryptsetup.h b/src/cryptsetup.h
index 0eb9c55..5d322cf 100644 (file)
--- a/src/cryptsetup.h
+++ b/src/cryptsetup.h
@@ -1,13 +1,15 @@
 /*
  * cryptsetup - setup cryptographic volumes for dm-crypt
  *
- * Copyright (C) 2004, Christophe Saout <christophe@saout.de>
+ * Copyright (C) 2004, Jana Saout <jana@saout.de>
  * Copyright (C) 2004-2007, Clemens Fruhwirth <clemens@endorphin.org>
  * Copyright (C) 2009-2012, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2009-2014, Milan Broz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,11 +24,6 @@
 #ifndef CRYPTSETUP_H
 #define CRYPTSETUP_H
 
-#define _LARGEFILE64_SOURCE
-#define _FILE_OFFSET_BITS 64
-
-#include <config.h>
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -60,13 +57,14 @@ extern int opt_force_password;
 
 /* Common tools */
 void clogger(struct crypt_device *cd, int level, const char *file, int line,
-            const char *format, ...);
+            const char *format, ...)  __attribute__ ((format (printf, 5, 6)));
 void tool_log(int level, const char *msg, void *usrptr __attribute__((unused)));
 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);