From bf102f6036b9291f0494b253b1558f2dab9ec001 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 24 Mar 2015 19:02:14 +0100 Subject: m + doc PASSPHRASE_STAR_CHAR, PASSPHRASE_TEXT_EMPTY and PASSPHRASE_TEXT_NOT_EMPTY MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/passphrase_helper.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/passphrase_helper.h b/src/passphrase_helper.h index 038ba85..1ba5833 100644 --- a/src/passphrase_helper.h +++ b/src/passphrase_helper.h @@ -25,17 +25,25 @@ # warning You cannot have both PASSPHRASE_TEXT and PASSPHRASE_STAR # undef PASSPHRASE_TEXT #endif +#if defined(PASSPHRASE_STAR) && defined(PASSPHRASE_ECHO) +# warning You cannot have both PASSPHRASE_STAR and PASSPHRASE_ECHO +# undef PASSPHRASE_ECHO +#endif +#if defined(PASSPHRASE_TEXT) && defined(PASSPHRASE_ECHO) +# warning You cannot have both PASSPHRASE_TEXT and PASSPHRASE_ECHO +# undef PASSPHRASE_ECHO +#endif /* Default texts */ #ifndef PASSPHRASE_STAR_CHAR -# define PASSPHRASE_STAR_CHAR "*" /* TODO document */ +# define PASSPHRASE_STAR_CHAR "*" #endif #ifndef PASSPHRASE_TEXT_EMPTY -# define PASSPHRASE_TEXT_EMPTY "(empty)" /* TODO document */ +# define PASSPHRASE_TEXT_EMPTY "(empty)" #endif #ifndef PASSPHRASE_TEXT_NOT_EMPTY -# define PASSPHRASE_TEXT_NOT_EMPTY "(not empty)" /* TODO document */ +# define PASSPHRASE_TEXT_NOT_EMPTY "(not empty)" #endif -- cgit v1.2.3-70-g09d2