=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/indent/io.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- src/usr.bin/indent/io.c 2003/09/26 22:23:28 1.8 +++ src/usr.bin/indent/io.c 2004/07/20 03:50:26 1.9 @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.8 2003/09/26 22:23:28 tedu Exp $ */ +/* $OpenBSD: io.c,v 1.9 2004/07/20 03:50:26 deraadt Exp $ */ /* * Copyright (c) 1985 Sun Microsystems, Inc. @@ -33,7 +33,7 @@ #ifndef lint /*static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: io.c,v 1.8 2003/09/26 22:23:28 tedu Exp $"; +static char rcsid[] = "$OpenBSD: io.c,v 1.9 2004/07/20 03:50:26 deraadt Exp $"; #endif /* not lint */ #include @@ -49,7 +49,7 @@ static int paren_target; void -dump_line() +dump_line(void) { /* dump_line is the routine that actually * effects the printing of the new source. It * prints the label section, followed by the @@ -283,7 +283,7 @@ } int -compute_code_target() +compute_code_target(void) { int target_col; @@ -310,7 +310,7 @@ } int -compute_label_target() +compute_label_target(void) { return ps.pcase ? (int) (case_ind * ps.ind_size) + 1 @@ -335,7 +335,7 @@ * */ void -fill_buffer() +fill_buffer(void) { /* this routine reads stuff from the input */ char *p, *buf2; int i; @@ -437,7 +437,7 @@ * ALGORITHM: Put tabs and/or blanks into pobuf, then write pobuf. * * PARAMETERS: current integer The current column target - * nteger The desired column + * target integer The desired column * * RETURNS: Integer value of the new column. (If current >= target, no action is * taken, and current is returned. @@ -452,11 +452,7 @@ * */ int -pad_output(current, target) /* writes tabs and blanks (if necessary) to - * get the current output position up to the - * target column */ - int current; /* the current column value */ - int target; /* position we want it at */ +pad_output(int current, int target) { int curr; /* internal column pointer */ int tcur; @@ -498,13 +494,7 @@ * */ int -count_spaces(current, buffer) -/* - * this routine figures out where the character position will be after - * printing the text in buffer starting at column "current" - */ - int current; - char *buffer; +count_spaces(int current, char *buffer) { char *buf; /* used to look thru buffer */ int cur; /* current character counter */ @@ -560,18 +550,14 @@ } void -writefdef(f, nm) - struct fstate *f; - int nm; +writefdef(struct fstate *f, int nm) { fprintf(output, ".ds f%c %s\n.nr s%c %d\n", nm, f->font, nm, f->size); } char * -chfont(of, nf, s) - struct fstate *of, *nf; - char *s; +chfont(struct fstate *of, struct fstate *nf, char *s) { if (of->font[0] != nf->font[0] || of->font[1] != nf->font[1]) { @@ -601,9 +587,7 @@ } void -parsefont(f, s0) - struct fstate *f; - char *s0; +parsefont(struct fstate *f, char *s0) { char *s = s0; int sizedelta = 0;