summaryrefslogtreecommitdiffstats
path: root/sys/modules/syscons
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2001-02-21 11:28:02 +0000
committernyan <nyan@FreeBSD.org>2001-02-21 11:28:02 +0000
commit8fdd73848c195f474018aa7c42f3e595312eb22b (patch)
treee2b59ca9f78a8238648311866bf78180c37fe386 /sys/modules/syscons
parent86dc8e8b76449463a56b93170d539d866dbaa48f (diff)
downloadFreeBSD-src-8fdd73848c195f474018aa7c42f3e595312eb22b.zip
FreeBSD-src-8fdd73848c195f474018aa7c42f3e595312eb22b.tar.gz
Fixed warnings.
Diffstat (limited to 'sys/modules/syscons')
-rw-r--r--sys/modules/syscons/daemon/daemon_saver.c20
-rw-r--r--sys/modules/syscons/snake/snake_saver.c2
-rw-r--r--sys/modules/syscons/star/star_saver.c6
3 files changed, 14 insertions, 14 deletions
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index 5d5c539..3cd5830 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -50,13 +50,13 @@
#define DAEMON_MAX_WIDTH 32
#define DAEMON_MAX_HEIGHT 19
-static char *message;
+static u_char *message;
static int messagelen;
static int blanked;
/* Who is the author of this ASCII pic? */
-static char *daemon_pic[] = {
+static u_char *daemon_pic[] = {
" , ,",
" /( )`",
" \\ \\___ / |",
@@ -79,7 +79,7 @@ static char *daemon_pic[] = {
NULL
};
-static char *daemon_attr[] = {
+static u_char *daemon_attr[] = {
" R R",
" RR RR",
" R RRRR R R",
@@ -107,11 +107,11 @@ static char *daemon_attr[] = {
* should do alphanumerics too, but I'm too lazy. <cshenton@it.hq.nasa.gov>
*/
-static char
-xflip_symbol(char symbol)
+static u_char
+xflip_symbol(u_char symbol)
{
- static const char lchars[] = "`'(){}[]\\/<>";
- static const char rchars[] = "'`)(}{][/\\><";
+ static const u_char lchars[] = "`'(){}[]\\/<>";
+ static const u_char rchars[] = "'`)(}{][/\\><";
int pos;
for (pos = 0; lchars[pos] != '\0'; pos++)
@@ -199,7 +199,7 @@ clear_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
}
static void
-draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, char *s, int len)
+draw_string(sc_softc_t *sc, int xpos, int ypos, int xoff, u_char *s, int len)
{
int x;
@@ -258,7 +258,7 @@ daemon_saver(video_adapter_t *adp, int blank)
blanked = 1;
clear_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
- clear_string(sc, txpos, typos, toff, (char *)message, tlen);
+ clear_string(sc, txpos, typos, toff, message, tlen);
if (++moved_daemon) {
/*
@@ -364,7 +364,7 @@ daemon_saver(video_adapter_t *adp, int blank)
tlen = scp->xsize - txpos;
draw_daemon(sc, dxpos, dypos, dxdir, xoff, yoff, xlen, ylen);
- draw_string(sc, txpos, typos, toff, (char *)message, tlen);
+ draw_string(sc, txpos, typos, toff, message, tlen);
} else {
#ifdef PC98
if (epson_machine_id == 0x20) {
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index a9a067a..ea5651f 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -47,7 +47,7 @@
#include <pc98/pc98/pc98_machdep.h>
#endif
-static char *message;
+static u_char *message;
static int *messagep;
static int messagelen;
static int blanked;
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 0008852..a1f24b8 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -59,12 +59,12 @@ star_saver(video_adapter_t *adp, int blank)
sc_softc_t *sc;
scr_stat *scp;
int cell, i;
- char pattern[] = {"...........++++*** "};
+ static u_char pattern[] = {"...........++++*** "};
#ifndef PC98
- char colors[] = {FG_DARKGREY, FG_LIGHTGREY,
+ static char colors[] = {FG_DARKGREY, FG_LIGHTGREY,
FG_WHITE, FG_LIGHTCYAN};
#else
- char colors[] = {FG_BLUE, FG_LIGHTGREY,
+ static char colors[] = {FG_BLUE, FG_LIGHTGREY,
FG_LIGHTGREY, FG_CYAN};
#endif /* PC98 */
static u_short stars[NUM_STARS][2];
OpenPOWER on IntegriCloud