===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/dc/inout.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- src/usr.bin/dc/inout.c	2005/12/14 08:10:02	1.13
+++ src/usr.bin/dc/inout.c	2006/01/15 19:11:59	1.14
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inout.c,v 1.13 2005/12/14 08:10:02 otto Exp $	*/
+/*	$OpenBSD: inout.c,v 1.14 2006/01/15 19:11:59 otto Exp $	*/
 
 /*
  * Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -17,7 +17,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: inout.c,v 1.13 2005/12/14 08:10:02 otto Exp $";
+static const char rcsid[] = "$OpenBSD: inout.c,v 1.14 2006/01/15 19:11:59 otto Exp $";
 #endif /* not lint */
 
 #include <ssl/ssl.h>
@@ -33,11 +33,11 @@
 static int	charcount;
 
 static int	src_getcharstream(struct source *);
-static int	src_ungetcharstream(struct source *);
+static void	src_ungetcharstream(struct source *);
 static char	*src_getlinestream(struct source *);
 static void	src_freestream(struct source *);
 static int	src_getcharstring(struct source *);
-static int	src_ungetcharstring(struct source *);
+static void	src_ungetcharstring(struct source *);
 static char	*src_getlinestring(struct source *);
 static void	src_freestring(struct source *);
 static void	flushwrap(FILE *);
@@ -80,12 +80,13 @@
 	return src->lastchar = getc(src->u.stream);
 }
 
-static int
+static void
 src_ungetcharstream(struct source *src)
 {
-	return ungetc(src->lastchar, src->u.stream);
+	(void)ungetc(src->lastchar, src->u.stream);
 }
 
+/* ARGSUSED */
 static void
 src_freestream(struct source *src)
 {
@@ -113,18 +114,13 @@
 	}
 }
 
-static int
+static void
 src_ungetcharstring(struct source *src)
 {
-	int ch;
-
 	if (src->u.string.pos > 0) {
 		if (src->lastchar != '\0')
 			--src->u.string.pos;
-		ch = src->u.string.buf[src->u.string.pos];
-		return ch == '\0' ? EOF : ch;
-	} else
-		return EOF;
+	}
 }
 
 static char *
@@ -156,7 +152,7 @@
 flushwrap(FILE *f)
 {
 	if (lastchar != -1)
-		putc(lastchar, f);
+		(void)putc(lastchar, f);
 }
 
 static void
@@ -164,11 +160,11 @@
 {
 	if (charcount >= MAX_CHARS_PER_LINE) {
 		charcount = 0;
-		fputs("\\\n", f);
+		(void)fputs("\\\n", f);
 	}
 	if (lastchar != -1) {
 		charcount++;
-		putc(lastchar, f);
+		(void)putc(lastchar, f);
 	}
 	lastchar = ch;
 }
@@ -179,7 +175,7 @@
 	char	buf[12];
 	char	*q = buf;
 
-	strlcpy(buf, p, sizeof(buf));
+	(void)strlcpy(buf, p, sizeof(buf));
 	while (*q)
 		putcharwrap(f, *q++);
 }
@@ -229,7 +225,7 @@
 	if (base != 10) {
 		scale_number(n->number, n->scale);
 		for (i = 0; i < n->scale; i++)
-			BN_div_word(n->number, base);
+			(void)BN_div_word(n->number, base);
 	}
 	if (sign)
 		negate(n);
@@ -341,11 +337,11 @@
 
 		putcharwrap(f, '.');
 		num_base = new_number();
-		BN_set_word(num_base->number, base);
+		bn_check(BN_set_word(num_base->number, base));
 		BN_init(&mult);
-		BN_one(&mult);
+		bn_check(BN_one(&mult));
 		BN_init(&stop);
-		BN_one(&stop);
+		bn_check(BN_one(&stop));
 		scale_number(&stop, b->scale);
 
 		i = 0;
@@ -362,11 +358,11 @@
 			p = get_digit(rem, digits, base);
 			int_part->scale = 0;
 			normalize(int_part, fract_part->scale);
-			BN_sub(fract_part->number, fract_part->number,
-			    int_part->number);
+			bn_check(BN_sub(fract_part->number, fract_part->number,
+			    int_part->number));
 			printwrap(f, p);
 			free(p);
-			BN_mul_word(&mult, base);
+			bn_check(BN_mul_word(&mult, base));
 		}
 		free_number(num_base);
 		BN_free(&mult);
@@ -380,17 +376,17 @@
 void
 print_value(FILE *f, const struct value *value, const char *prefix, u_int base)
 {
-	fputs(prefix, f);
+	(void)fputs(prefix, f);
 	switch (value->type) {
 	case BCODE_NONE:
 		if (value->array != NULL)
-			fputs("<array>", f);
+			(void)fputs("<array>", f);
 		break;
 	case BCODE_NUMBER:
 		printnumber(f, value->u.num, base);
 		break;
 	case BCODE_STRING:
-		fputs(value->u.string, f);
+		(void)fputs(value->u.string, f);
 		break;
 	}
 }
@@ -412,7 +408,7 @@
 		ch = 0;
 		for (i = 0; i < 8; i++)
 			ch |= BN_is_bit_set(v, numbits-i-1) << (7 - i);
-		putc(ch, f);
+		(void)putc(ch, f);
 		numbits -= 8;
 	}
 	BN_free(v);