From 1b940b136c1f0b68a0a6b5af6072ec374ccb3856 Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusic@ucbvax.Berkeley.EDU>
Date: Thu, 8 Oct 1981 02:31:52 -0800
Subject: [PATCH] fix unsigned char problem to get FRAG == 8 to work

SCCS-vsn: sbin/fsck/main.c 1.7
SCCS-vsn: sys/ufs/ffs/fs.h 1.3
SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 1.5
SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 1.5
SCCS-vsn: sys/ufs/ffs/ffs_tables.c 1.2
---
 usr/src/sbin/fsck/main.c         | 4 ++--
 usr/src/sys/ufs/ffs/ffs_alloc.c  | 6 +++---
 usr/src/sys/ufs/ffs/ffs_tables.c | 8 ++++----
 usr/src/sys/ufs/ffs/fs.h         | 4 ++--
 usr/src/sys/ufs/lfs/lfs_alloc.c  | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/usr/src/sbin/fsck/main.c b/usr/src/sbin/fsck/main.c
index 92be95bc1d..9199126389 100644
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -1,4 +1,4 @@
-static	char *sccsid = "@(#)main.c	1.6 (Berkeley) %G%";
+static	char *sccsid = "@(#)main.c	1.7 (Berkeley) %G%";
 
 #include <stdio.h>
 #include <ctype.h>
@@ -1546,7 +1546,7 @@ makecg()
  * of some frags
  */
 fragacct(fragmap, fraglist, cnt)
-	char fragmap;
+	int fragmap;
 	short fraglist[];
 	int cnt;
 {
diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index 5d0d04d239..e6b81a89b6 100644
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1981 Regents of the University of California */
 
-static char vers[] = "@(#)ffs_alloc.c 1.4 %G%";
+static char vers[] = "@(#)ffs_alloc.c 1.5 %G%";
 
 /*	alloc.c	4.8	81/03/08	*/
 
@@ -567,7 +567,7 @@ ifree(dev, ino, mode)
  * of some frags
  */
 fragacct(fragmap, fraglist, cnt)
-	char fragmap;
+	int fragmap;
 	short fraglist[];
 	int cnt;
 {
@@ -575,7 +575,7 @@ fragacct(fragmap, fraglist, cnt)
 	register int field, subfield;
 	register int siz, pos;
 
-	inblk = (int)(fragtbl[fragmap] << 1);
+	inblk = (int)(fragtbl[fragmap]) << 1;
 	fragmap <<= 1;
 	for (siz = 1; siz < FRAG; siz++) {
 		if (((1 << siz) & inblk) == 0)
diff --git a/usr/src/sys/ufs/ffs/ffs_tables.c b/usr/src/sys/ufs/ffs/ffs_tables.c
index ecf19a0d72..04d888a139 100644
--- a/usr/src/sys/ufs/ffs/ffs_tables.c
+++ b/usr/src/sys/ufs/ffs/ffs_tables.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1981 Regents of the University of California */
 
-/* @(#)ffs_tables.c 1.1 %G% */
+/* @(#)ffs_tables.c 1.2 %G% */
 
 #include "../h/param.h"
 
@@ -13,7 +13,7 @@
  * no special processing on output.
  */
 
-char partab[] = {
+unsigned char partab[] = {
 	0001,0201,0201,0001,0201,0001,0001,0201,
 	0202,0004,0003,0201,0005,0206,0201,0001,
 	0201,0001,0001,0201,0001,0201,0201,0001,
@@ -78,7 +78,7 @@ int inside[9] = {
  * quickly find an appropriate fragment.
  */
 #if FRAG == 4
-char fragtbl[256] = {
+unsigned char fragtbl[256] = {
 	0x0, 0x1, 0x1, 0x2, 0x1, 0x1, 0x2, 0x4,
 	0x1, 0x1, 0x1, 0x3, 0x2, 0x3, 0x4, 0x8,
 	0x1, 0x1, 0x1, 0x3, 0x1, 0x1, 0x3, 0x5,
@@ -115,7 +115,7 @@ char fragtbl[256] = {
 #endif
 
 #if FRAG == 8
-char fragtbl[256] = {
+unsigned char fragtbl[256] = {
 	0x00, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x04,
 	0x01, 0x01, 0x01, 0x03, 0x02, 0x03, 0x04, 0x08,
 	0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x03, 0x05,
diff --git a/usr/src/sys/ufs/ffs/fs.h b/usr/src/sys/ufs/ffs/fs.h
index 0e9b8cad3a..ba417624d7 100644
--- a/usr/src/sys/ufs/ffs/fs.h
+++ b/usr/src/sys/ufs/ffs/fs.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 1981 Regents of the University of California */
 
-/*	fs.h	1.2	%G%	*/
+/*	fs.h	1.3	%G%	*/
 
 /*
  * Each disk drive contains some number of file systems.
@@ -213,5 +213,5 @@ struct	cg {
 #ifdef KERNEL
 struct	fs *getfs();
 int inside[], around[];
-char fragtbl[];
+unsigned char fragtbl[];
 #endif
diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 2a7f090d9a..b8ad5f8733 100644
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1981 Regents of the University of California */
 
-static char vers[] = "@(#)lfs_alloc.c 1.4 %G%";
+static char vers[] = "@(#)lfs_alloc.c 1.5 %G%";
 
 /*	alloc.c	4.8	81/03/08	*/
 
@@ -567,7 +567,7 @@ ifree(dev, ino, mode)
  * of some frags
  */
 fragacct(fragmap, fraglist, cnt)
-	char fragmap;
+	int fragmap;
 	short fraglist[];
 	int cnt;
 {
@@ -575,7 +575,7 @@ fragacct(fragmap, fraglist, cnt)
 	register int field, subfield;
 	register int siz, pos;
 
-	inblk = (int)(fragtbl[fragmap] << 1);
+	inblk = (int)(fragtbl[fragmap]) << 1;
 	fragmap <<= 1;
 	for (siz = 1; siz < FRAG; siz++) {
 		if (((1 << siz) & inblk) == 0)
-- 
2.20.1