From 50efbad61c9f5bdd82c59026edc772f1f4e13080 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 7 Apr 2014 17:58:40 +0200 Subject: fix warnings + update gitignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- .gitignore | 3 +++ src/passphrase.c | 6 +++--- 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 -- cgit v1.2.3-70-g09d2