diff options
author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-01-08 14:48:57 +0000 |
---|---|---|
committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-01-08 14:48:57 +0000 |
commit | d3e1a39709b691b175cbf10d49618d6287e19ae1 (patch) | |
tree | 162d1b805462f42f1069846c136780b4e72da450 /sys/dev/wsfont | |
parent | 9ba056edd7caaceca2ae0b6e9930dc2dbc31d212 (diff) |
Ansify non-ansified function definitions. No functional change.
ok miod@
Diffstat (limited to 'sys/dev/wsfont')
-rw-r--r-- | sys/dev/wsfont/wsfont.c | 43 |
1 files changed, 13 insertions, 30 deletions
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c index f988163b3d6..f82dcad1b86 100644 --- a/sys/dev/wsfont/wsfont.c +++ b/sys/dev/wsfont/wsfont.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfont.c,v 1.27 2012/01/08 14:46:11 shadchin Exp $ */ +/* $OpenBSD: wsfont.c,v 1.28 2012/01/08 14:48:56 shadchin Exp $ */ /* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */ /*- @@ -213,8 +213,7 @@ static struct font *wsfont_find0(int); */ static void wsfont_revbit(struct wsdisplay_font *); static void -wsfont_revbit(font) - struct wsdisplay_font *font; +wsfont_revbit(struct wsdisplay_font *font) { u_char *p, *m; @@ -234,8 +233,7 @@ wsfont_revbit(font) */ static void wsfont_revbyte(struct wsdisplay_font *); static void -wsfont_revbyte(font) - struct wsdisplay_font *font; +wsfont_revbyte(struct wsdisplay_font *font) { int x, l, r, nr; u_char *rp; @@ -267,8 +265,7 @@ wsfont_revbyte(font) * Enumerate the list of fonts */ void -wsfont_enum(cb) - void (*cb)(char *, int, int, int); +wsfont_enum(void (*cb)(char *, int, int, int)) { struct wsdisplay_font *f; struct font *ent; @@ -393,8 +390,7 @@ wsfont_init(void) * Find a font by cookie. Called at splhigh. */ static struct font * -wsfont_find0(cookie) - int cookie; +wsfont_find0(int cookie) { struct font *ent; @@ -409,9 +405,7 @@ wsfont_find0(cookie) * Find a font. */ int -wsfont_find(name, width, height, stride) - char *name; - int width, height, stride; +wsfont_find(char *name, int width, int height, int stride) { struct font *ent; int s; @@ -443,9 +437,7 @@ wsfont_find(name, width, height, stride) * Add a font to the list. */ int -wsfont_add(font, copy) - struct wsdisplay_font *font; - int copy; +wsfont_add(struct wsdisplay_font *font, int copy) { static int cookiegen = 666; struct font *ent; @@ -496,8 +488,7 @@ wsfont_add(font, copy) */ #ifdef notyet int -wsfont_remove(cookie) - int cookie; +wsfont_remove(int cookie) { struct font *ent; int s; @@ -541,10 +532,8 @@ wsfont_remove(cookie) * requested by the caller differs. */ int -wsfont_lock(cookie, ptr, bitorder, byteorder) - int cookie; - struct wsdisplay_font **ptr; - int bitorder, byteorder; +wsfont_lock(int cookie, struct wsdisplay_font **ptr, int bitorder, + int byteorder) { struct font *ent; int s, lc; @@ -593,8 +582,7 @@ wsfont_lock(cookie, ptr, bitorder, byteorder) * Get font flags and lockcount. */ int -wsfont_getflg(cookie, flg, lc) - int cookie, *flg, *lc; +wsfont_getflg(int cookie, int *flg, int *lc) { struct font *ent; int s; @@ -614,8 +602,7 @@ wsfont_getflg(cookie, flg, lc) * Unlock a given font and return new lockcount. */ int -wsfont_unlock(cookie) - int cookie; +wsfont_unlock(int cookie) { struct font *ent; int s, lc; @@ -746,7 +733,6 @@ static struct wsfont_level2_glyphmap *ibm437_level1[] = { NULL, &ibm437_level2_37 }; - /* * ISO-8859-7 maps */ @@ -796,7 +782,6 @@ static struct wsfont_level2_glyphmap *iso7_level1[] = { &iso7_level2_32 }; - static struct wsfont_level1_glyphmap encodings[] = { { NULL, 0, 0 }, /* WSDISPLAY_FONTENC_ISO */ { ibm437_level1, 0, 38 }, /* WSDISPLAY_FONTENC_IBM */ @@ -812,9 +797,7 @@ static struct wsfont_level1_glyphmap encodings[] = { * Remap Unicode character to glyph */ int -wsfont_map_unichar(font, c) - struct wsdisplay_font *font; - int c; +wsfont_map_unichar(struct wsdisplay_font *font, int c) { if (font->encoding == WSDISPLAY_FONTENC_ISO) return c; |