Some formatting updates (ran the code through indent)

 -Erik

1 files changed, 98 insertions, 98 deletions

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index e44525d9c..64b725610 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * loadfont.c - Eugene Crosser & Andries Brouwer
  *
@@ -30,72 +31,69 @@
 #define PSF_SEPARATOR  0xFFFF
 
 static const char loadfont_usage[] = "loadfont\n"
-"\n"
-"\tLoad a console font from standard input.\n"
-"\n";
+	"\n" "\tLoad a console font from standard input.\n" "\n";
 
-struct psf_header
-{
-  unsigned char magic1, magic2;	/* Magic number */
-  unsigned char mode;		/* PSF font mode */
-  unsigned char charsize;	/* Character size */
+struct psf_header {
+	unsigned char magic1, magic2;	/* Magic number */
+	unsigned char mode;			/* PSF font mode */
+	unsigned char charsize;		/* Character size */
 };
 
 #define PSF_MAGIC_OK(x)	((x).magic1 == PSF_MAGIC1 && (x).magic2 == PSF_MAGIC2)
 
 static void loadnewfont(int fd);
 
-extern int
-loadfont_main(int argc, char **argv)
+extern int loadfont_main(int argc, char **argv)
 {
 	int fd;
 
 	fd = open("/dev/tty0", O_RDWR);
 	if (fd < 0) {
-	    fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno));
-	    return 1;
+		fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno));
+		return 1;
 	}
 	loadnewfont(fd);
 
 	return 0;
 }
 
-static void
-do_loadfont(int fd, char *inbuf, int unit, int fontsize) {
+static void do_loadfont(int fd, char *inbuf, int unit, int fontsize)
+{
 	char buf[16384];
 	int i;
 
-	memset(buf,0,sizeof(buf));
+	memset(buf, 0, sizeof(buf));
 
 	if (unit < 1 || unit > 32) {
-	    fprintf(stderr, "Bad character size %d\n", unit);
-	    exit(1);
+		fprintf(stderr, "Bad character size %d\n", unit);
+		exit(1);
 	}
 
 	for (i = 0; i < fontsize; i++)
-	    memcpy(buf+(32*i), inbuf+(unit*i), unit);
+		memcpy(buf + (32 * i), inbuf + (unit * i), unit);
 
 #if defined( PIO_FONTX ) && !defined( __sparc__ )
 	{
-	    struct consolefontdesc cfd;
+		struct consolefontdesc cfd;
 
-	    cfd.charcount = fontsize;
-	    cfd.charheight = unit;
-	    cfd.chardata = buf;
+		cfd.charcount = fontsize;
+		cfd.charheight = unit;
+		cfd.chardata = buf;
 
-	    if (ioctl(fd, PIO_FONTX, &cfd) == 0)
-	      return;		/* success */
-	    perror("PIO_FONTX ioctl error (trying PIO_FONT)");
+		if (ioctl(fd, PIO_FONTX, &cfd) == 0)
+			return;				/* success */
+		perror("PIO_FONTX ioctl error (trying PIO_FONT)");
 	}
 #endif
 	if (ioctl(fd, PIO_FONT, buf)) {
-	    perror("PIO_FONT ioctl error");
-	    exit(1);
+		perror("PIO_FONT ioctl error");
+		exit(1);
 	}
 }
 
 static void
-do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) {
+do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
+{
 	struct unimapinit advice;
 	struct unimapdesc ud;
 	struct unipair *up;
@@ -103,23 +101,24 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) {
 	int glyph;
 	u_short unicode;
 
-	maxct = tailsz;		/* more than enough */
+	maxct = tailsz;				/* more than enough */
 	up = (struct unipair *) malloc(maxct * sizeof(struct unipair));
+
 	if (!up) {
-	    fprintf(stderr, "Out of memory?\n");
-	    exit(1);
+		fprintf(stderr, "Out of memory?\n");
+		exit(1);
 	}
 	for (glyph = 0; glyph < fontsize; glyph++) {
-	    while (tailsz >= 2) {
-		unicode = (((u_short) inbuf[1]) << 8) + inbuf[0];
-		tailsz -= 2;
-		inbuf += 2;
-		if (unicode == PSF_SEPARATOR)
-		    break;
-		up[ct].unicode = unicode;
-		up[ct].fontpos = glyph;
-		ct++;
-	    }
+		while (tailsz >= 2) {
+			unicode = (((u_short) inbuf[1]) << 8) + inbuf[0];
+			tailsz -= 2;
+			inbuf += 2;
+			if (unicode == PSF_SEPARATOR)
+				break;
+			up[ct].unicode = unicode;
+			up[ct].fontpos = glyph;
+			ct++;
+		}
 	}
 
 	/* Note: after PIO_UNIMAPCLR and before PIO_UNIMAP
@@ -128,33 +127,33 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize) {
 	advice.advised_hashsize = 0;
 	advice.advised_hashstep = 0;
 	advice.advised_hashlevel = 0;
-	if(ioctl(fd, PIO_UNIMAPCLR, &advice)) {
+	if (ioctl(fd, PIO_UNIMAPCLR, &advice)) {
 #ifdef ENOIOCTLCMD
-	    if (errno == ENOIOCTLCMD) {
-		fprintf(stderr, "It seems this kernel is older than 1.1.92\n");
-		fprintf(stderr, "No Unicode mapping table loaded.\n");
-	    } else
+		if (errno == ENOIOCTLCMD) {
+			fprintf(stderr, "It seems this kernel is older than 1.1.92\n");
+			fprintf(stderr, "No Unicode mapping table loaded.\n");
+		} else
 #endif
-	      perror("PIO_UNIMAPCLR");
-	    exit(1);
+			perror("PIO_UNIMAPCLR");
+		exit(1);
 	}
 	ud.entry_ct = ct;
 	ud.entries = up;
-	if(ioctl(fd, PIO_UNIMAP, &ud)) {
+	if (ioctl(fd, PIO_UNIMAP, &ud)) {
 #if 0
-	    if (errno == ENOMEM) {
-		/* change advice parameters */
-	    }
+		if (errno == ENOMEM) {
+			/* change advice parameters */
+		}
 #endif
-	    perror("PIO_UNIMAP");
-	    exit(1);
+		perror("PIO_UNIMAP");
+		exit(1);
 	}
 }
 
-static void
-loadnewfont(int fd) {
+static void loadnewfont(int fd)
+{
 	int unit;
-	char inbuf[32768];	/* primitive */
+	char inbuf[32768];			/* primitive */
 	int inputlth, offset;
 
 	/*
@@ -178,57 +177,58 @@ loadnewfont(int fd) {
 
 	/* test for psf first */
 	{
-	    struct psf_header psfhdr;
-	    int fontsize;
-	    int hastable;
-	    int head0, head;
+		struct psf_header psfhdr;
+		int fontsize;
+		int hastable;
+		int head0, head;
 
-	    if (inputlth < sizeof(struct psf_header))
-		goto no_psf;
+		if (inputlth < sizeof(struct psf_header))
+			goto no_psf;
 
-	    psfhdr = * (struct psf_header *) &inbuf[0];
+		psfhdr = *(struct psf_header *) &inbuf[0];
 
-	    if (!PSF_MAGIC_OK(psfhdr))
-		goto no_psf;
+		if (!PSF_MAGIC_OK(psfhdr))
+			goto no_psf;
 
-	    if (psfhdr.mode > PSF_MAXMODE) {
-		fprintf(stderr, "Unsupported psf file mode\n");
-		exit(1);
-	    }
-	    fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256);
+		if (psfhdr.mode > PSF_MAXMODE) {
+			fprintf(stderr, "Unsupported psf file mode\n");
+			exit(1);
+		}
+		fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256);
 #if !defined( PIO_FONTX ) || defined( __sparc__ )
-	    if (fontsize != 256) {
-		fprintf(stderr, "Only fontsize 256 supported\n");
-		exit(1);
-	    }
+		if (fontsize != 256) {
+			fprintf(stderr, "Only fontsize 256 supported\n");
+			exit(1);
+		}
 #endif
-	    hastable = (psfhdr.mode & PSF_MODEHASTAB);
-	    unit = psfhdr.charsize;
-	    head0 = sizeof(struct psf_header);
-	    head = head0 + fontsize*unit;
-	    if (head > inputlth || (!hastable && head != inputlth)) {
-		fprintf(stderr, "Input file: bad length\n");
-		exit(1);
-	    }
-	    do_loadfont(fd, inbuf + head0, unit, fontsize);
-	    if (hastable)
-	      do_loadtable(fd, inbuf + head, inputlth-head, fontsize);
-	    return;
+		hastable = (psfhdr.mode & PSF_MODEHASTAB);
+		unit = psfhdr.charsize;
+		head0 = sizeof(struct psf_header);
+
+		head = head0 + fontsize * unit;
+		if (head > inputlth || (!hastable && head != inputlth)) {
+			fprintf(stderr, "Input file: bad length\n");
+			exit(1);
+		}
+		do_loadfont(fd, inbuf + head0, unit, fontsize);
+		if (hastable)
+			do_loadtable(fd, inbuf + head, inputlth - head, fontsize);
+		return;
 	}
-      no_psf:
+  no_psf:
 
 	/* file with three code pages? */
 	if (inputlth == 9780) {
-	    offset = 40;
-	    unit = 16;
+		offset = 40;
+		unit = 16;
 	} else {
-	    /* bare font */
-	    if (inputlth & 0377) {
-		fprintf(stderr, "Bad input file size\n");
-		exit(1);
-	    }
-	    offset = 0;
-	    unit = inputlth/256;
+		/* bare font */
+		if (inputlth & 0377) {
+			fprintf(stderr, "Bad input file size\n");
+			exit(1);
+		}
+		offset = 0;
+		unit = inputlth / 256;
 	}
-	do_loadfont(fd, inbuf+offset, unit, 256);
+	do_loadfont(fd, inbuf + offset, unit, 256);
 }