summaryrefslogtreecommitdiff
path: root/sys/dev/rcons
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-03-14 03:16:15 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-03-14 03:16:15 +0000
commite63dc855fe4ff1aa0029ebf9813134860a34ccdf (patch)
treec2aa960c67a99a878c8902943399029fa598683f /sys/dev/rcons
parent71eb96ce8a9190e7ffeccbabd7a5ec4f3b4fc72f (diff)
Final __P removal plus some cosmetic fixups
Diffstat (limited to 'sys/dev/rcons')
-rw-r--r--sys/dev/rcons/raster.h16
-rw-r--r--sys/dev/rcons/raster_op.c10
-rw-r--r--sys/dev/rcons/raster_text.c8
3 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/rcons/raster.h b/sys/dev/rcons/raster.h
index c8e4f54f92b..29f247875ba 100644
--- a/sys/dev/rcons/raster.h
+++ b/sys/dev/rcons/raster.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: raster.h,v 1.3 1997/11/07 08:07:38 niklas Exp $ */
+/* $OpenBSD: raster.h,v 1.4 2002/03/14 03:16:07 millert Exp $ */
/* $NetBSD: raster.h,v 1.3 1995/11/24 23:50:51 cgd Exp $ */
/*-
@@ -95,9 +95,9 @@ struct raster {
/* Colormap struct. */
struct raster_colormap {
int length;
- u_char* red;
- u_char* grn;
- u_char* blu;
+ u_char *red;
+ u_char *grn;
+ u_char *blu;
};
/* Font character struct. */
@@ -210,13 +210,13 @@ extern int raster_replsrc ARGS(( struct raster* dst, int dx, int dy, int w, int
/* Raster text routines */
-extern struct raster_font* raster_fontopen ARGS(( char* fontname ));
+extern struct raster_font* raster_fontopen ARGS(( char *fontname ));
/* Opens a font. Returns (struct raster_font*) 0 on failure. */
-extern int raster_text ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char* text ));
+extern int raster_text ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char *text ));
/* Draws text. Returns 0 on success, -1 on failure. */
-extern int raster_textn ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char* text, int len ));
+extern int raster_textn ARGS(( struct raster* r, int x, int y, int rop, struct raster_font* rf, unsigned char *text, int len ));
/* Draws n characters of text. Returns 0 on success, -1 on failure. */
extern void raster_fontclose ARGS(( struct raster_font* rf ));
@@ -225,7 +225,7 @@ extern void raster_fontclose ARGS(( struct raster_font* rf ));
/* Frame buffer routines. */
-extern struct raster* raster_open ARGS(( char* fbname ));
+extern struct raster* raster_open ARGS(( char *fbname ));
/* Opens a frame buffer as a raster. Returns (struct raster*) 0 on failure. */
extern struct raster* raster_coloropen ARGS(( void ));
diff --git a/sys/dev/rcons/raster_op.c b/sys/dev/rcons/raster_op.c
index 17a7eaaf2e5..937dc776ed3 100644
--- a/sys/dev/rcons/raster_op.c
+++ b/sys/dev/rcons/raster_op.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raster_op.c,v 1.4 2002/03/14 01:27:02 millert Exp $ */
+/* $OpenBSD: raster_op.c,v 1.5 2002/03/14 03:16:07 millert Exp $ */
/* $NetBSD: raster_op.c,v 1.4 1996/03/14 19:02:30 christos Exp $ */
/*-
@@ -623,7 +623,7 @@ raster_op_noclip( dst, dx, dy, w, h, rop, src, sx, sy )
src->linelongs == dst->linelongs && src->linelongs == w >> 5 )
{
bcopy(
- (char*) srclin1, (char*) dstlin1,
+ (char *) srclin1, (char *) dstlin1,
h * src->linelongs * sizeof(u_int32_t) );
return 0;
}
@@ -732,7 +732,7 @@ raster_op_noclip( dst, dx, dy, w, h, rop, src, sx, sy )
if ( op == RAS_SRC && src->width == w && dst->width == w &&
src->linelongs == dst->linelongs && src->linelongs == w >> 2 )
{
- bcopy( (char*) srclin1, (char*) dstlin1,
+ bcopy( (char *) srclin1, (char *) dstlin1,
h * src->linelongs * sizeof(u_int32_t) );
return 0;
}
@@ -782,7 +782,7 @@ raster_op_nosrc_noclip( dst, dx, dy, w, h, rop )
/* Special-case full-width clears. */
if ( op == RAS_CLEAR && dst->width == w && dst->linelongs == w >> 5 )
{
- bzero( (char*) dstlin1, h * dst->linelongs * sizeof(u_int32_t) );
+ bzero( (char *) dstlin1, h * dst->linelongs * sizeof(u_int32_t) );
return 0;
}
#endif /*BCOPY_FASTER*/
@@ -877,7 +877,7 @@ raster_op_nosrc_noclip( dst, dx, dy, w, h, rop )
/* Special-case full-width clears. */
if ( op == RAS_CLEAR && dst->width == w && dst->linelongs == w >> 2 )
{
- bzero( (char*) dstlin1, h * dst->linelongs * sizeof(u_int32_t) );
+ bzero( (char *) dstlin1, h * dst->linelongs * sizeof(u_int32_t) );
return 0;
}
#endif /*BCOPY_FASTER*/
diff --git a/sys/dev/rcons/raster_text.c b/sys/dev/rcons/raster_text.c
index 5b0188c1296..23133ce12a3 100644
--- a/sys/dev/rcons/raster_text.c
+++ b/sys/dev/rcons/raster_text.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raster_text.c,v 1.3 1997/11/07 08:07:39 niklas Exp $ */
+/* $OpenBSD: raster_text.c,v 1.4 2002/03/14 03:16:07 millert Exp $ */
/* $NetBSD: raster_text.c,v 1.3 1995/11/24 23:50:56 cgd Exp $ */
/*-
@@ -69,7 +69,7 @@ raster_text( r, x, y, rop, rf, text )
int x, y;
int rop;
struct raster_font* rf;
- unsigned char* text;
+ unsigned char *text;
{
return raster_textn( r, x, y, rop, rf, text, strlen( text ) );
}
@@ -81,12 +81,12 @@ raster_textn( r, x, y, rop, rf, text, n )
int x, y;
int rop;
struct raster_font* rf;
- unsigned char* text;
+ unsigned char *text;
int n;
{
int clip;
int x1, y1;
- struct raster_char* c;
+ struct raster_char *c;
struct raster* charrast;
int i;
register unsigned char ch;