aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2015-03-24 19:02:14 +0100
committerMattias Andrée <maandree@operamail.com>2015-03-24 19:02:14 +0100
commitbf102f6036b9291f0494b253b1558f2dab9ec001 (patch)
tree875101861b0b9434419a5875e4301a3bd5d34af0 /src
parentfix PASSPHRASE_TEXT (diff)
downloadlibpassphrase-bf102f6036b9291f0494b253b1558f2dab9ec001.tar.gz
libpassphrase-bf102f6036b9291f0494b253b1558f2dab9ec001.tar.bz2
libpassphrase-bf102f6036b9291f0494b253b1558f2dab9ec001.tar.xz
m + doc PASSPHRASE_STAR_CHAR, PASSPHRASE_TEXT_EMPTY and PASSPHRASE_TEXT_NOT_EMPTY1427220157
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src')
-rw-r--r--src/passphrase_helper.h14
1 files changed, 11 insertions, 3 deletions
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