aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-04-07 17:58:40 +0200
committerMattias Andrée <maandree@operamail.com>2014-04-07 17:58:40 +0200
commit50efbad61c9f5bdd82c59026edc772f1f4e13080 (patch)
tree5a05a7ae87d423894caf78df974742cd759834a2
parentimprove makefile and add more warnings (diff)
downloadlibpassphrase-50efbad61c9f5bdd82c59026edc772f1f4e13080.tar.gz
libpassphrase-50efbad61c9f5bdd82c59026edc772f1f4e13080.tar.bz2
libpassphrase-50efbad61c9f5bdd82c59026edc772f1f4e13080.tar.xz
fix warnings + update gitignore
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r--.gitignore3
-rw-r--r--src/passphrase.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index d4da9fb..331e90c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@ obj/
*.out
*.gch
*.info
+*.pdf
+*.ps
+*.dvi
*.gz
*.bz2
*.xz
diff --git a/src/passphrase.c b/src/passphrase.c
index 3492df2..2098b31 100644
--- a/src/passphrase.c
+++ b/src/passphrase.c
@@ -308,7 +308,7 @@ char* passphrase_read(void)
xflush();
if (len == size)
{
- if ((rc = xrealloc(rc, size, size << 1L)) == NULL)
+ if ((rc = xrealloc(rc, (size_t)size, (size_t)size << 1)) == NULL)
return NULL;
size <<= 1L;
}
@@ -353,9 +353,9 @@ void passphrase_disable_echo(void)
tcgetattr(STDIN_FILENO, &stty);
saved_stty = stty;
- stty.c_lflag &= ~ECHO;
+ stty.c_lflag &= (tcflag_t)~ECHO;
#if defined(PASSPHRASE_STAR) || defined(PASSPHRASE_MOVE)
- stty.c_lflag &= ~ICANON;
+ stty.c_lflag &= (tcflag_t)~ICANON;
#endif
tcsetattr(STDIN_FILENO, TCSAFLUSH, &stty);
#endif