From ea144ae9da6f54d800cd57d9f9292c0db5e08d80 Mon Sep 17 00:00:00 2001 From: des Date: Sat, 7 Apr 2007 13:36:53 +0000 Subject: Merge from upstream: ------------------------------------------------------------------------ r380 | des | 2006-03-14 15:42:09 +0100 (Tue, 14 Mar 2006) | 1 line Fix signedness mismatch, and use an explicit cast when calling ctype functions. ------------------------------------------------------------------------ --- contrib/openpam/lib/openpam_readline.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/openpam/lib/openpam_readline.c b/contrib/openpam/lib/openpam_readline.c index 11dda5c..222ed76 100644 --- a/contrib/openpam/lib/openpam_readline.c +++ b/contrib/openpam/lib/openpam_readline.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_readline.c#3 $ + * $Id: openpam_readline.c 380 2006-03-14 14:42:09Z des $ */ #include @@ -52,7 +52,7 @@ char * openpam_readline(FILE *f, int *lineno, size_t *lenp) { - unsigned char *line; + char *line; size_t len, size; int ch; @@ -63,7 +63,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp) #define line_putch(ch) do { \ if (len >= size - 1) { \ - unsigned char *tmp = realloc(line, size *= 2); \ + char *tmp = realloc(line, size *= 2); \ if (tmp == NULL) \ goto fail; \ line = tmp; \ @@ -83,7 +83,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp) /* eof */ if (ch == EOF) { /* remove trailing whitespace */ - while (len > 0 && isspace(line[len - 1])) + while (len > 0 && isspace((int)line[len - 1])) --len; line[len] = '\0'; if (len == 0) @@ -96,7 +96,7 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp) ++*lineno; /* remove trailing whitespace */ - while (len > 0 && isspace(line[len - 1])) + while (len > 0 && isspace((int)line[len - 1])) --len; line[len] = '\0'; /* skip blank lines */ -- cgit v1.1