Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kill some more register declarations.

This commit is contained in:
augustss 2000-03-30 12:19:46 +00:00
parent 1469ed1614
commit 1279e67b6e
31 changed files with 225 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/lib/libkern/inet_addr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inet_addr.c,v 1.4 1999/04/13 19:00:30 drochner Exp $ */ /* $NetBSD: inet_addr.c,v 1.5 2000/03/30 12:19:46 augustss Exp $ */
/* Copyright (c) 1996 by Internet Software Consortium. /* Copyright (c) 1996 by Internet Software Consortium.
* *
@ -56,7 +56,7 @@ inet_addr(src)
int base, n; int base, n;
unsigned char c; unsigned char c;
u_int parts[4]; u_int parts[4];
register u_int *pp = parts; u_int *pp = parts;
c = *src; c = *src;
for (;;) { for (;;) {

4
sys/lib/libkern/random.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: random.c,v 1.3 1996/11/13 19:30:39 cgd Exp $ */ /* $NetBSD: random.c,v 1.4 2000/03/30 12:19:46 augustss Exp $ */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -46,7 +46,7 @@ u_long
random() random()
{ {
static u_long randseed = 1; static u_long randseed = 1;
register long x, hi, lo, t; long x, hi, lo, t;
/* /*
* Compute x[n + 1] = (7^5 * x[n]) mod (2^31 - 1). * Compute x[n + 1] = (7^5 * x[n]) mod (2^31 - 1).

8
sys/lib/libkern/scanc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scanc.c,v 1.4 1996/10/24 23:50:31 cgd Exp $ */ /* $NetBSD: scanc.c,v 1.5 2000/03/30 12:19:46 augustss Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1989 Regents of the University of California. * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@ -41,10 +41,10 @@
int int
scanc(size, cp, table, mask) scanc(size, cp, table, mask)
u_int size; u_int size;
const register u_char *cp, table[]; const u_char *cp, table[];
register u_char mask; u_char mask;
{ {
const register u_char *end = &cp[size]; const u_char *end = &cp[size];
while (cp < end && (table[*cp] & mask) == 0) while (cp < end && (table[*cp] & mask) == 0)
cp++; cp++;

8
sys/lib/libkern/skpc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: skpc.c,v 1.3 1996/03/14 18:52:18 christos Exp $ */ /* $NetBSD: skpc.c,v 1.4 2000/03/30 12:19:46 augustss Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1989 Regents of the University of California. * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@ -40,11 +40,11 @@
int int
skpc(mask, size, cp) skpc(mask, size, cp)
register int mask; int mask;
size_t size; size_t size;
register u_char *cp; u_char *cp;
{ {
register u_char *end = &cp[size]; u_char *end = &cp[size];
while (cp < end && *cp == (u_char) mask) while (cp < end && *cp == (u_char) mask)
cp++; cp++;

6
sys/lib/libsa/alloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: alloc.c,v 1.14 1999/05/28 19:31:51 cgd Exp $ */ /* $NetBSD: alloc.c,v 1.15 2000/03/30 12:19:47 augustss Exp $ */
/* /*
* Copyright (c) 1997 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1997 Christopher G. Demetriou. All rights reserved.
@ -134,7 +134,7 @@ void *
alloc(size) alloc(size)
unsigned size; unsigned size;
{ {
register struct fl **f = &freelist, **bestf = NULL; struct fl **f = &freelist, **bestf = NULL;
#ifndef ALLOC_FIRST_FIT #ifndef ALLOC_FIRST_FIT
unsigned bestsize = 0xffffffff; /* greater than any real size */ unsigned bestsize = 0xffffffff; /* greater than any real size */
#endif #endif
@ -213,7 +213,7 @@ free(ptr, size)
void *ptr; void *ptr;
unsigned size; /* only for consistence check */ unsigned size; /* only for consistence check */
{ {
register struct fl *f = struct fl *f =
(struct fl *)((char*)ptr - ALIGN(sizeof(unsigned))); (struct fl *)((char*)ptr - ALIGN(sizeof(unsigned)));
#ifdef ALLOC_TRACE #ifdef ALLOC_TRACE
printf("free(%lx, %u) (origsize %u)\n", (u_long)ptr, size, f->size); printf("free(%lx, %u) (origsize %u)\n", (u_long)ptr, size, f->size);

30
sys/lib/libsa/arp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: arp.c,v 1.20 1999/11/13 21:17:56 thorpej Exp $ */ /* $NetBSD: arp.c,v 1.21 2000/03/30 12:19:47 augustss Exp $ */
/* /*
* Copyright (c) 1992 Regents of the University of California. * Copyright (c) 1992 Regents of the University of California.
@ -95,12 +95,12 @@ static ssize_t arprecv __P((struct iodesc *, void *, size_t, time_t));
/* Broadcast an ARP packet, asking who has addr on interface d */ /* Broadcast an ARP packet, asking who has addr on interface d */
u_char * u_char *
arpwhohas(d, addr) arpwhohas(d, addr)
register struct iodesc *d; struct iodesc *d;
struct in_addr addr; struct in_addr addr;
{ {
register int i; int i;
register struct ether_arp *ah; struct ether_arp *ah;
register struct arp_list *al; struct arp_list *al;
struct { struct {
struct ether_header eh; struct ether_header eh;
struct { struct {
@ -173,9 +173,9 @@ arpwhohas(d, addr)
static ssize_t static ssize_t
arpsend(d, pkt, len) arpsend(d, pkt, len)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
{ {
#ifdef ARP_DEBUG #ifdef ARP_DEBUG
@ -192,13 +192,13 @@ arpsend(d, pkt, len)
*/ */
static ssize_t static ssize_t
arprecv(d, pkt, len, tleft) arprecv(d, pkt, len, tleft)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
time_t tleft; time_t tleft;
{ {
register ssize_t n; ssize_t n;
register struct ether_arp *ah; struct ether_arp *ah;
u_int16_t etype; /* host order */ u_int16_t etype; /* host order */
#ifdef ARP_DEBUG #ifdef ARP_DEBUG
@ -282,8 +282,8 @@ arprecv(d, pkt, len, tleft)
*/ */
void void
arp_reply(d, pkt) arp_reply(d, pkt)
register struct iodesc *d; struct iodesc *d;
register void *pkt; /* the request */ void *pkt; /* the request */
{ {
struct ether_arp *arp = pkt; struct ether_arp *arp = pkt;

6
sys/lib/libsa/bcopy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bcopy.c,v 1.7 1999/03/30 22:03:47 cgd Exp $ */ /* $NetBSD: bcopy.c,v 1.8 2000/03/30 12:19:47 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -49,8 +49,8 @@ bcopy(s1, s2, n)
void *s2; void *s2;
size_t n; size_t n;
{ {
register const char *f = s1; const char *f = s1;
register char *t = s2; char *t = s2;
if (f < t) { if (f < t) {
f += n; f += n;

32
sys/lib/libsa/bootp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootp.c,v 1.18 1999/11/13 21:17:56 thorpej Exp $ */ /* $NetBSD: bootp.c,v 1.19 2000/03/30 12:19:47 augustss Exp $ */
/* /*
* Copyright (c) 1992 Regents of the University of California. * Copyright (c) 1992 Regents of the University of California.
@ -90,7 +90,7 @@ bootp(sock)
int sock; int sock;
{ {
struct iodesc *d; struct iodesc *d;
register struct bootp *bp; struct bootp *bp;
struct { struct {
u_char header[HEADER_SIZE]; u_char header[HEADER_SIZE];
struct bootp wbootp; struct bootp wbootp;
@ -241,11 +241,11 @@ bootp(sock)
/* Transmit a bootp request */ /* Transmit a bootp request */
static ssize_t static ssize_t
bootpsend(d, pkt, len) bootpsend(d, pkt, len)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
{ {
register struct bootp *bp; struct bootp *bp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
@ -265,13 +265,13 @@ bootpsend(d, pkt, len)
static ssize_t static ssize_t
bootprecv(d, pkt, len, tleft) bootprecv(d, pkt, len, tleft)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
time_t tleft; time_t tleft;
{ {
register ssize_t n; ssize_t n;
register struct bootp *bp; struct bootp *bp;
#ifdef BOOTP_DEBUGx #ifdef BOOTP_DEBUGx
if (debug) if (debug)
@ -329,12 +329,12 @@ bad:
static int static int
vend_rfc1048(cp, len) vend_rfc1048(cp, len)
register u_char *cp; u_char *cp;
u_int len; u_int len;
{ {
register u_char *ep; u_char *ep;
register int size; int size;
register u_char tag; u_char tag;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
@ -396,7 +396,7 @@ static void
vend_cmu(cp) vend_cmu(cp)
u_char *cp; u_char *cp;
{ {
register struct cmu_vend *vp; struct cmu_vend *vp;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)

8
sys/lib/libsa/checkpasswd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: checkpasswd.c,v 1.3 1999/11/13 21:17:56 thorpej Exp $ */ /* $NetBSD: checkpasswd.c,v 1.4 2000/03/30 12:19:47 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -40,8 +40,8 @@ char *
getpass(prompt) getpass(prompt)
const char *prompt; const char *prompt;
{ {
register int c; int c;
register char *lp; char *lp;
static char buf[128]; /* == _PASSWORD_LEN */ static char buf[128]; /* == _PASSWORD_LEN */
printf(prompt); printf(prompt);
@ -69,7 +69,7 @@ getpass(prompt)
break; break;
#endif #endif
case 'r'&037: { case 'r'&037: {
register char *p; char *p;
putchar('\n'); putchar('\n');
for (p = buf; p < lp; ++p) for (p = buf; p < lp; ++p)

4
sys/lib/libsa/close.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: close.c,v 1.8 1999/03/31 01:50:25 cgd Exp $ */ /* $NetBSD: close.c,v 1.9 2000/03/30 12:19:47 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -74,7 +74,7 @@ oclose(fd)
#endif #endif
int fd; int fd;
{ {
register struct open_file *f = &files[fd]; struct open_file *f = &files[fd];
int err1 = 0, err2 = 0; int err1 = 0, err2 = 0;
#if !defined(LIBSA_NO_FD_CHECKING) #if !defined(LIBSA_NO_FD_CHECKING)

8
sys/lib/libsa/dkcksum.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dkcksum.c,v 1.1 1996/01/13 22:25:37 leo Exp $ */ /* $NetBSD: dkcksum.c,v 1.2 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -44,10 +44,10 @@
*/ */
int int
dkcksum(lp) dkcksum(lp)
register struct disklabel *lp; struct disklabel *lp;
{ {
register u_short *start, *end; u_short *start, *end;
register u_short sum = 0; u_short sum = 0;
start = (u_short *)lp; start = (u_short *)lp;
end = (u_short *)&lp->d_partitions[lp->d_npartitions]; end = (u_short *)&lp->d_partitions[lp->d_npartitions];

24
sys/lib/libsa/ether.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ether.c,v 1.14 1999/11/13 21:17:56 thorpej Exp $ */ /* $NetBSD: ether.c,v 1.15 2000/03/30 12:19:48 augustss Exp $ */
/* /*
* Copyright (c) 1992 Regents of the University of California. * Copyright (c) 1992 Regents of the University of California.
@ -67,8 +67,8 @@ sendether(d, pkt, len, dea, etype)
u_char *dea; u_char *dea;
int etype; int etype;
{ {
register ssize_t n; ssize_t n;
register struct ether_header *eh; struct ether_header *eh;
#ifdef ETHER_DEBUG #ifdef ETHER_DEBUG
if (debug) if (debug)
@ -97,14 +97,14 @@ sendether(d, pkt, len, dea, etype)
*/ */
ssize_t ssize_t
readether(d, pkt, len, tleft, etype) readether(d, pkt, len, tleft, etype)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
time_t tleft; time_t tleft;
register u_int16_t *etype; u_int16_t *etype;
{ {
register ssize_t n; ssize_t n;
register struct ether_header *eh; struct ether_header *eh;
#ifdef ETHER_DEBUG #ifdef ETHER_DEBUG
if (debug) if (debug)
@ -140,11 +140,11 @@ readether(d, pkt, len, tleft, etype)
static char digits[] = "0123456789abcdef"; static char digits[] = "0123456789abcdef";
char * char *
ether_sprintf(ap) ether_sprintf(ap)
register u_char *ap; u_char *ap;
{ {
register int i; int i;
static char etherbuf[18]; static char etherbuf[18];
register char *cp = etherbuf; char *cp = etherbuf;
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
*cp++ = digits[*ap >> 4]; *cp++ = digits[*ap >> 4];

4
sys/lib/libsa/fstat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fstat.c,v 1.2 1999/03/31 01:50:25 cgd Exp $ */ /* $NetBSD: fstat.c,v 1.3 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -42,7 +42,7 @@ fstat(fd, sb)
int fd; int fd;
struct stat *sb; struct stat *sb;
{ {
register struct open_file *f = &files[fd]; struct open_file *f = &files[fd];
#if !defined(LIBSA_NO_FD_CHECKING) #if !defined(LIBSA_NO_FD_CHECKING)
if ((unsigned)fd >= SOPEN_MAX || f->f_flags == 0) { if ((unsigned)fd >= SOPEN_MAX || f->f_flags == 0) {

8
sys/lib/libsa/gets.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gets.c,v 1.6 1995/10/11 21:16:57 pk Exp $ */ /* $NetBSD: gets.c,v 1.7 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -41,8 +41,8 @@ void
gets(buf) gets(buf)
char *buf; char *buf;
{ {
register int c; int c;
register char *lp; char *lp;
for (lp = buf;;) for (lp = buf;;)
switch (c = getchar() & 0177) { switch (c = getchar() & 0177) {
@ -67,7 +67,7 @@ gets(buf)
break; break;
#endif #endif
case 'r'&037: { case 'r'&037: {
register char *p; char *p;
putchar('\n'); putchar('\n');
for (p = buf; p < lp; ++p) for (p = buf; p < lp; ++p)

10
sys/lib/libsa/in_cksum.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in_cksum.c,v 1.4 1999/02/11 09:10:44 pk Exp $ */ /* $NetBSD: in_cksum.c,v 1.5 2000/03/30 12:19:48 augustss Exp $ */
/* /*
* Copyright (c) 1992 Regents of the University of California. * Copyright (c) 1992 Regents of the University of California.
@ -63,11 +63,11 @@
*/ */
int int
in_cksum(p, len) in_cksum(p, len)
register void *p; void *p;
register int len; int len;
{ {
register int sum = 0, oddbyte = 0, v = 0; int sum = 0, oddbyte = 0, v = 0;
register u_char *cp = p; u_char *cp = p;
/* we assume < 2^16 bytes being summed */ /* we assume < 2^16 bytes being summed */
while (len > 0) { while (len > 0) {

4
sys/lib/libsa/ioctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ioctl.c,v 1.5 1999/03/31 01:50:25 cgd Exp $ */ /* $NetBSD: ioctl.c,v 1.6 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -73,7 +73,7 @@ ioctl(fd, cmd, arg)
char *arg; char *arg;
{ {
#if !defined(LIBSA_NO_FD_CHECKING) || !defined(LIBSA_NO_RAW_ACCESS) #if !defined(LIBSA_NO_FD_CHECKING) || !defined(LIBSA_NO_RAW_ACCESS)
register struct open_file *f = &files[fd]; struct open_file *f = &files[fd];
#endif #endif
#if !defined(LIBSA_NO_FD_CHECKING) #if !defined(LIBSA_NO_FD_CHECKING)

50
sys/lib/libsa/lfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs.c,v 1.5 1999/11/13 21:17:56 thorpej Exp $ */ /* $NetBSD: lfs.c,v 1.6 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -145,8 +145,8 @@ static int search_directory __P((char *, struct open_file *, ino_t *));
static int static int
find_inode_sector(ino_t inumber, struct open_file *f, ufs_daddr_t *isp) find_inode_sector(ino_t inumber, struct open_file *f, ufs_daddr_t *isp)
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register struct fs *fs = fp->f_fs; struct fs *fs = fp->f_fs;
ufs_daddr_t ifileent_blkno; ufs_daddr_t ifileent_blkno;
char *ent_in_buf; char *ent_in_buf;
size_t buf_after_ent; size_t buf_after_ent;
@ -186,8 +186,8 @@ read_inode(inumber, f)
ino_t inumber; ino_t inumber;
struct open_file *f; struct open_file *f;
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register struct fs *fs = fp->f_fs; struct fs *fs = fp->f_fs;
struct dinode *dip; struct dinode *dip;
ufs_daddr_t inode_sector; ufs_daddr_t inode_sector;
size_t rsize; size_t rsize;
@ -233,7 +233,7 @@ read_inode(inumber, f)
* Clear out the old buffers * Clear out the old buffers
*/ */
{ {
register int level; int level;
for (level = 0; level < NIADDR; level++) for (level = 0; level < NIADDR; level++)
fp->f_blkno[level] = -1; fp->f_blkno[level] = -1;
@ -254,8 +254,8 @@ block_map(f, file_block, disk_block_p)
daddr_t file_block; daddr_t file_block;
daddr_t *disk_block_p; /* out */ daddr_t *disk_block_p; /* out */
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register struct fs *fs = fp->f_fs; struct fs *fs = fp->f_fs;
int level; int level;
int idx; int idx;
daddr_t ind_block_num; daddr_t ind_block_num;
@ -366,10 +366,10 @@ buf_read_file(f, buf_p, size_p)
char **buf_p; /* out */ char **buf_p; /* out */
size_t *size_p; /* out */ size_t *size_p; /* out */
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register struct fs *fs = fp->f_fs; struct fs *fs = fp->f_fs;
long off; long off;
register daddr_t file_block; daddr_t file_block;
daddr_t disk_block; daddr_t disk_block;
size_t block_size; size_t block_size;
int rc; int rc;
@ -434,8 +434,8 @@ search_directory(name, f, inumber_p)
struct open_file *f; struct open_file *f;
ino_t *inumber_p; /* out */ ino_t *inumber_p; /* out */
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register struct direct *dp; struct direct *dp;
struct direct *edp; struct direct *edp;
char *buf; char *buf;
size_t buf_size; size_t buf_size;
@ -484,8 +484,8 @@ lfs_open(path, f)
struct open_file *f; struct open_file *f;
{ {
#ifndef LIBSA_FS_SINGLECOMPONENT #ifndef LIBSA_FS_SINGLECOMPONENT
register char *cp, *ncp; char *cp, *ncp;
register int c; int c;
#endif #endif
ino_t inumber; ino_t inumber;
struct file *fp; struct file *fp;
@ -524,8 +524,8 @@ lfs_open(path, f)
* Calculate indirect block levels. * Calculate indirect block levels.
*/ */
{ {
register int mult; int mult;
register int level; int level;
mult = 1; mult = 1;
for (level = 0; level < NIADDR; level++) { for (level = 0; level < NIADDR; level++) {
@ -562,7 +562,7 @@ lfs_open(path, f)
* Get next component of path name. * Get next component of path name.
*/ */
{ {
register int len = 0; int len = 0;
ncp = cp; ncp = cp;
while ((c = *cp) != '\0' && c != '/') { while ((c = *cp) != '\0' && c != '/') {
@ -621,7 +621,7 @@ lfs_open(path, f)
*/ */
size_t buf_size; size_t buf_size;
daddr_t disk_block; daddr_t disk_block;
register struct fs *fs = fp->f_fs; struct fs *fs = fp->f_fs;
if (!buf) if (!buf)
buf = alloc(fs->fs_bsize); buf = alloc(fs->fs_bsize);
@ -699,7 +699,7 @@ int
lfs_close(f) lfs_close(f)
struct open_file *f; struct open_file *f;
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
int level; int level;
f->f_fsdata = (void *)0; f->f_fsdata = (void *)0;
@ -729,12 +729,12 @@ lfs_read(f, start, size, resid)
size_t size; size_t size;
size_t *resid; /* out */ size_t *resid; /* out */
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register size_t csize; size_t csize;
char *buf; char *buf;
size_t buf_size; size_t buf_size;
int rc = 0; int rc = 0;
register char *addr = start; char *addr = start;
while (size != 0) { while (size != 0) {
if (fp->f_seekp >= fp->f_di.di_size) if (fp->f_seekp >= fp->f_di.di_size)
@ -782,7 +782,7 @@ lfs_seek(f, offset, where)
off_t offset; off_t offset;
int where; int where;
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
switch (where) { switch (where) {
case SEEK_SET: case SEEK_SET:
@ -806,7 +806,7 @@ lfs_stat(f, sb)
struct open_file *f; struct open_file *f;
struct stat *sb; struct stat *sb;
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
/* only important stuff */ /* only important stuff */
sb->st_mode = fp->f_di.di_mode; sb->st_mode = fp->f_di.di_mode;

4
sys/lib/libsa/lseek.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lseek.c,v 1.5 1999/03/31 01:50:25 cgd Exp $ */ /* $NetBSD: lseek.c,v 1.6 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -76,7 +76,7 @@ olseek(fd, offset, where)
off_t offset; off_t offset;
int where; int where;
{ {
register struct open_file *f = &files[fd]; struct open_file *f = &files[fd];
#if !defined(LIBSA_NO_FD_CHECKING) #if !defined(LIBSA_NO_FD_CHECKING)
if ((unsigned)fd >= SOPEN_MAX || f->f_flags == 0) { if ((unsigned)fd >= SOPEN_MAX || f->f_flags == 0) {

6
sys/lib/libsa/memcpy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: memcpy.c,v 1.3 1999/03/31 01:39:16 cgd Exp $ */ /* $NetBSD: memcpy.c,v 1.4 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -47,8 +47,8 @@ memcpy(s1, s2, n)
const void *s2; const void *s2;
size_t n; size_t n;
{ {
register const char *f = s2; const char *f = s2;
register char *t = s1; char *t = s1;
while (n-- > 0) while (n-- > 0)
*t++ = *f++; *t++ = *f++;

52
sys/lib/libsa/net.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: net.c,v 1.25 1999/11/13 21:17:57 thorpej Exp $ */ /* $NetBSD: net.c,v 1.26 2000/03/30 12:19:48 augustss Exp $ */
/* /*
* Copyright (c) 1992 Regents of the University of California. * Copyright (c) 1992 Regents of the University of California.
@ -65,14 +65,14 @@
/* Caller must leave room for ethernet, ip and udp headers in front!! */ /* Caller must leave room for ethernet, ip and udp headers in front!! */
ssize_t ssize_t
sendudp(d, pkt, len) sendudp(d, pkt, len)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
{ {
register ssize_t cc; ssize_t cc;
register struct ip *ip; struct ip *ip;
register struct udphdr *uh; struct udphdr *uh;
register u_char *ea; u_char *ea;
#ifdef NET_DEBUG #ifdef NET_DEBUG
if (debug) { if (debug) {
@ -107,7 +107,7 @@ sendudp(d, pkt, len)
#ifndef UDP_NO_CKSUM #ifndef UDP_NO_CKSUM
{ {
register struct udpiphdr *ui; struct udpiphdr *ui;
struct ip tip; struct ip tip;
/* Calculate checksum (must save and restore ip header) */ /* Calculate checksum (must save and restore ip header) */
@ -140,15 +140,15 @@ sendudp(d, pkt, len)
*/ */
ssize_t ssize_t
readudp(d, pkt, len, tleft) readudp(d, pkt, len, tleft)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
time_t tleft; time_t tleft;
{ {
register ssize_t n; ssize_t n;
register size_t hlen; size_t hlen;
register struct ip *ip; struct ip *ip;
register struct udphdr *uh; struct udphdr *uh;
u_int16_t etype; /* host order */ u_int16_t etype; /* host order */
#ifdef NET_DEBUG #ifdef NET_DEBUG
@ -237,7 +237,7 @@ readudp(d, pkt, len, tleft)
#ifndef UDP_NO_CKSUM #ifndef UDP_NO_CKSUM
if (uh->uh_sum) { if (uh->uh_sum) {
register struct udpiphdr *ui; struct udpiphdr *ui;
struct ip tip; struct ip tip;
n = ntohs(uh->uh_ulen) + sizeof(*ip); n = ntohs(uh->uh_ulen) + sizeof(*ip);
@ -288,16 +288,16 @@ readudp(d, pkt, len, tleft)
*/ */
ssize_t ssize_t
sendrecv(d, sproc, sbuf, ssize, rproc, rbuf, rsize) sendrecv(d, sproc, sbuf, ssize, rproc, rbuf, rsize)
register struct iodesc *d; struct iodesc *d;
register ssize_t (*sproc)(struct iodesc *, void *, size_t); ssize_t (*sproc)(struct iodesc *, void *, size_t);
register void *sbuf; void *sbuf;
register size_t ssize; size_t ssize;
register ssize_t (*rproc)(struct iodesc *, void *, size_t, time_t); ssize_t (*rproc)(struct iodesc *, void *, size_t, time_t);
register void *rbuf; void *rbuf;
register size_t rsize; size_t rsize;
{ {
register ssize_t cc; ssize_t cc;
register time_t t, tmo, tlast; time_t t, tmo, tlast;
long tleft; long tleft;
#ifdef NET_DEBUG #ifdef NET_DEBUG

4
sys/lib/libsa/netif.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netif.c,v 1.14 1999/11/13 21:17:57 thorpej Exp $ */ /* $NetBSD: netif.c,v 1.15 2000/03/30 12:19:48 augustss Exp $ */
/* /*
* Copyright (c) 1993 Adam Glass * Copyright (c) 1993 Adam Glass
@ -303,7 +303,7 @@ netif_open(machdep_hint)
void *machdep_hint; void *machdep_hint;
{ {
int fd; int fd;
register struct iodesc *s; struct iodesc *s;
struct netif *nif; struct netif *nif;
/* find a free socket */ /* find a free socket */

28
sys/lib/libsa/nfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs.c,v 1.28 1999/11/23 12:20:53 simonb Exp $ */ /* $NetBSD: nfs.c,v 1.29 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 John Brezak * Copyright (c) 1993 John Brezak
@ -123,11 +123,11 @@ ssize_t nfs_readdata __P((struct nfs_iodesc *, off_t, void *, size_t));
*/ */
int int
nfs_getrootfh(d, path, fhp) nfs_getrootfh(d, path, fhp)
register struct iodesc *d; struct iodesc *d;
char *path; char *path;
u_char *fhp; u_char *fhp;
{ {
register int len; int len;
struct args { struct args {
n_long len; n_long len;
char path[FNAME_SIZE]; char path[FNAME_SIZE];
@ -190,7 +190,7 @@ nfs_lookupfh(d, name, newfd)
char *name; char *name;
struct nfs_iodesc *newfd; struct nfs_iodesc *newfd;
{ {
register int len, rlen; int len, rlen;
struct args { struct args {
u_char fh[NFS_FHSIZE]; u_char fh[NFS_FHSIZE];
n_long len; n_long len;
@ -403,10 +403,10 @@ nfs_open(path, f)
struct open_file *f; struct open_file *f;
{ {
struct nfs_iodesc *newfd, *currfd; struct nfs_iodesc *newfd, *currfd;
register char *cp; char *cp;
#ifndef NFS_NOSYMLINK #ifndef NFS_NOSYMLINK
register char *ncp; char *ncp;
register int c; int c;
char namebuf[NFS_MAXPATHLEN + 1]; char namebuf[NFS_MAXPATHLEN + 1];
char linkbuf[NFS_MAXPATHLEN + 1]; char linkbuf[NFS_MAXPATHLEN + 1];
int nlinks = 0; int nlinks = 0;
@ -453,7 +453,7 @@ nfs_open(path, f)
* Get next component of path name. * Get next component of path name.
*/ */
{ {
register int len = 0; int len = 0;
ncp = cp; ncp = cp;
while ((c = *cp) != '\0' && c != '/') { while ((c = *cp) != '\0' && c != '/') {
@ -559,7 +559,7 @@ int
nfs_close(f) nfs_close(f)
struct open_file *f; struct open_file *f;
{ {
register struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata; struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
#ifdef NFS_DEBUG #ifdef NFS_DEBUG
if (debug) if (debug)
@ -583,9 +583,9 @@ nfs_read(f, buf, size, resid)
size_t size; size_t size;
size_t *resid; /* out */ size_t *resid; /* out */
{ {
register struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata; struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
register ssize_t cc; ssize_t cc;
register char *addr = buf; char *addr = buf;
#ifdef NFS_DEBUG #ifdef NFS_DEBUG
if (debug) if (debug)
@ -642,7 +642,7 @@ nfs_seek(f, offset, where)
off_t offset; off_t offset;
int where; int where;
{ {
register struct nfs_iodesc *d = (struct nfs_iodesc *)f->f_fsdata; struct nfs_iodesc *d = (struct nfs_iodesc *)f->f_fsdata;
n_long size = ntohl(d->fa.fa_size); n_long size = ntohl(d->fa.fa_size);
switch (where) { switch (where) {
@ -672,7 +672,7 @@ nfs_stat(f, sb)
struct stat *sb; struct stat *sb;
{ {
struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata; struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
register n_long ftype, mode; n_long ftype, mode;
ftype = ntohl(fp->fa.fa_type); ftype = ntohl(fp->fa.fa_type);
mode = ntohl(fp->fa.fa_mode); mode = ntohl(fp->fa.fa_mode);

8
sys/lib/libsa/open.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: open.c,v 1.19 1999/03/31 01:50:26 cgd Exp $ */ /* $NetBSD: open.c,v 1.20 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -85,10 +85,10 @@ oopen(fname, mode)
const char *fname; const char *fname;
int mode; int mode;
{ {
register struct open_file *f; struct open_file *f;
register int fd, error; int fd, error;
#if !defined(LIBSA_SINGLE_FILESYSTEM) #if !defined(LIBSA_SINGLE_FILESYSTEM)
register int i, besterror; int i, besterror;
#endif #endif
char *file; char *file;

20
sys/lib/libsa/rarp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rarp.c,v 1.19 1999/11/13 21:17:57 thorpej Exp $ */ /* $NetBSD: rarp.c,v 1.20 2000/03/30 12:19:48 augustss Exp $ */
/* /*
* Copyright (c) 1992 Regents of the University of California. * Copyright (c) 1992 Regents of the University of California.
@ -88,7 +88,7 @@ rarp_getipaddress(sock)
int sock; int sock;
{ {
struct iodesc *d; struct iodesc *d;
register struct ether_arp *ap; struct ether_arp *ap;
struct { struct {
u_char header[ETHER_SIZE]; u_char header[ETHER_SIZE];
struct { struct {
@ -159,9 +159,9 @@ rarp_getipaddress(sock)
*/ */
static ssize_t static ssize_t
rarpsend(d, pkt, len) rarpsend(d, pkt, len)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
{ {
#ifdef RARP_DEBUG #ifdef RARP_DEBUG
@ -178,13 +178,13 @@ rarpsend(d, pkt, len)
*/ */
static ssize_t static ssize_t
rarprecv(d, pkt, len, tleft) rarprecv(d, pkt, len, tleft)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
time_t tleft; time_t tleft;
{ {
register ssize_t n; ssize_t n;
register struct ether_arp *ap; struct ether_arp *ap;
u_int16_t etype; /* host order */ u_int16_t etype; /* host order */
#ifdef RARP_DEBUG #ifdef RARP_DEBUG

4
sys/lib/libsa/read.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: read.c,v 1.9 1999/03/31 01:50:26 cgd Exp $ */ /* $NetBSD: read.c,v 1.10 2000/03/30 12:19:48 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -77,7 +77,7 @@ oread(fd, dest, bcount)
void *dest; void *dest;
size_t bcount; size_t bcount;
{ {
register struct open_file *f = &files[fd]; struct open_file *f = &files[fd];
size_t resid; size_t resid;
#if !defined(LIBSA_NO_FD_CHECKING) #if !defined(LIBSA_NO_FD_CHECKING)

26
sys/lib/libsa/rpc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rpc.c,v 1.20 1999/11/13 21:17:57 thorpej Exp $ */ /* $NetBSD: rpc.c,v 1.21 2000/03/30 12:19:49 augustss Exp $ */
/* /*
* Copyright (c) 1992 Regents of the University of California. * Copyright (c) 1992 Regents of the University of California.
@ -114,14 +114,14 @@ int rpc_port = 0x400; /* predecrement */
*/ */
ssize_t ssize_t
rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen) rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
register struct iodesc *d; struct iodesc *d;
register n_long prog, vers, proc; n_long prog, vers, proc;
register void *sdata; void *sdata;
register size_t slen; size_t slen;
register void *rdata; void *rdata;
register size_t rlen; size_t rlen;
{ {
register ssize_t cc; ssize_t cc;
struct auth_info *auth; struct auth_info *auth;
struct rpc_call *call; struct rpc_call *call;
struct rpc_reply *reply; struct rpc_reply *reply;
@ -238,12 +238,12 @@ rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
*/ */
static ssize_t static ssize_t
recvrpc(d, pkt, len, tleft) recvrpc(d, pkt, len, tleft)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
time_t tleft; time_t tleft;
{ {
register struct rpc_reply *reply; struct rpc_reply *reply;
ssize_t n; ssize_t n;
int x; int x;
@ -383,7 +383,7 @@ rpc_pmap_putcache(addr, prog, vers, port)
*/ */
int int
rpc_getport(d, prog, vers) rpc_getport(d, prog, vers)
register struct iodesc *d; struct iodesc *d;
n_long prog; /* host order */ n_long prog; /* host order */
n_long vers; /* host order */ n_long vers; /* host order */
{ {

6
sys/lib/libsa/subr_prf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_prf.c,v 1.2 1999/04/20 23:04:17 cgd Exp $ */ /* $NetBSD: subr_prf.c,v 1.3 2000/03/30 12:19:49 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -106,8 +106,8 @@ kdoprnt(put, fmt, ap)
const char *fmt; const char *fmt;
va_list ap; va_list ap;
{ {
register char *p; char *p;
register int ch, n; int ch, n;
unsigned long ul; unsigned long ul;
int lflag, set; int lflag, set;

10
sys/lib/libsa/tftp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tftp.c,v 1.9 1999/11/13 21:17:57 thorpej Exp $ */ /* $NetBSD: tftp.c,v 1.10 2000/03/30 12:19:49 augustss Exp $ */
/* /*
* Copyright (c) 1996 * Copyright (c) 1996
@ -111,9 +111,9 @@ static void tftp_terminate __P((struct tftp_handle *));
static ssize_t static ssize_t
recvtftp(d, pkt, len, tleft) recvtftp(d, pkt, len, tleft)
register struct iodesc *d; struct iodesc *d;
register void *pkt; void *pkt;
register size_t len; size_t len;
time_t tleft; time_t tleft;
{ {
ssize_t n; ssize_t n;
@ -139,7 +139,7 @@ recvtftp(d, pkt, len, tleft)
/* /*
* First data packet from new port. * First data packet from new port.
*/ */
register struct udphdr *uh; struct udphdr *uh;
uh = (struct udphdr *) pkt - 1; uh = (struct udphdr *) pkt - 1;
d->destport = uh->uh_sport; d->destport = uh->uh_sport;
} /* else check uh_sport has not changed??? */ } /* else check uh_sport has not changed??? */

48
sys/lib/libsa/ufs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs.c,v 1.29 1999/11/13 21:17:57 thorpej Exp $ */ /* $NetBSD: ufs.c,v 1.30 2000/03/30 12:19:49 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -135,8 +135,8 @@ read_inode(inumber, f)
ino_t inumber; ino_t inumber;
struct open_file *f; struct open_file *f;
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register struct fs *fs = fp->f_fs; struct fs *fs = fp->f_fs;
char *buf; char *buf;
size_t rsize; size_t rsize;
int rc; int rc;
@ -159,7 +159,7 @@ read_inode(inumber, f)
} }
{ {
register struct dinode *dp; struct dinode *dp;
dp = (struct dinode *)buf; dp = (struct dinode *)buf;
fp->f_di = dp[ino_to_fsbo(fs, inumber)]; fp->f_di = dp[ino_to_fsbo(fs, inumber)];
@ -169,7 +169,7 @@ read_inode(inumber, f)
* Clear out the old buffers * Clear out the old buffers
*/ */
{ {
register int level; int level;
for (level = 0; level < NIADDR; level++) for (level = 0; level < NIADDR; level++)
fp->f_blkno[level] = -1; fp->f_blkno[level] = -1;
@ -190,8 +190,8 @@ block_map(f, file_block, disk_block_p)
daddr_t file_block; daddr_t file_block;
daddr_t *disk_block_p; /* out */ daddr_t *disk_block_p; /* out */
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register struct fs *fs = fp->f_fs; struct fs *fs = fp->f_fs;
int level; int level;
int idx; int idx;
daddr_t ind_block_num; daddr_t ind_block_num;
@ -298,10 +298,10 @@ buf_read_file(f, buf_p, size_p)
char **buf_p; /* out */ char **buf_p; /* out */
size_t *size_p; /* out */ size_t *size_p; /* out */
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register struct fs *fs = fp->f_fs; struct fs *fs = fp->f_fs;
long off; long off;
register daddr_t file_block; daddr_t file_block;
daddr_t disk_block; daddr_t disk_block;
size_t block_size; size_t block_size;
int rc; int rc;
@ -362,8 +362,8 @@ search_directory(name, f, inumber_p)
struct open_file *f; struct open_file *f;
ino_t *inumber_p; /* out */ ino_t *inumber_p; /* out */
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register struct direct *dp; struct direct *dp;
struct direct *edp; struct direct *edp;
char *buf; char *buf;
size_t buf_size; size_t buf_size;
@ -412,8 +412,8 @@ ufs_open(path, f)
struct open_file *f; struct open_file *f;
{ {
#ifndef LIBSA_FS_SINGLECOMPONENT #ifndef LIBSA_FS_SINGLECOMPONENT
register char *cp, *ncp; char *cp, *ncp;
register int c; int c;
#endif #endif
ino_t inumber; ino_t inumber;
struct file *fp; struct file *fp;
@ -456,8 +456,8 @@ ufs_open(path, f)
* Calculate indirect block levels. * Calculate indirect block levels.
*/ */
{ {
register int mult; int mult;
register int level; int level;
mult = 1; mult = 1;
for (level = 0; level < NIADDR; level++) { for (level = 0; level < NIADDR; level++) {
@ -494,7 +494,7 @@ ufs_open(path, f)
* Get next component of path name. * Get next component of path name.
*/ */
{ {
register int len = 0; int len = 0;
ncp = cp; ncp = cp;
while ((c = *cp) != '\0' && c != '/') { while ((c = *cp) != '\0' && c != '/') {
@ -553,7 +553,7 @@ ufs_open(path, f)
*/ */
size_t buf_size; size_t buf_size;
daddr_t disk_block; daddr_t disk_block;
register struct fs *fs = fp->f_fs; struct fs *fs = fp->f_fs;
if (!buf) if (!buf)
buf = alloc(fs->fs_bsize); buf = alloc(fs->fs_bsize);
@ -627,7 +627,7 @@ int
ufs_close(f) ufs_close(f)
struct open_file *f; struct open_file *f;
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
int level; int level;
f->f_fsdata = (void *)0; f->f_fsdata = (void *)0;
@ -657,12 +657,12 @@ ufs_read(f, start, size, resid)
size_t size; size_t size;
size_t *resid; /* out */ size_t *resid; /* out */
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
register size_t csize; size_t csize;
char *buf; char *buf;
size_t buf_size; size_t buf_size;
int rc = 0; int rc = 0;
register char *addr = start; char *addr = start;
while (size != 0) { while (size != 0) {
if (fp->f_seekp >= fp->f_di.di_size) if (fp->f_seekp >= fp->f_di.di_size)
@ -710,7 +710,7 @@ ufs_seek(f, offset, where)
off_t offset; off_t offset;
int where; int where;
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
switch (where) { switch (where) {
case SEEK_SET: case SEEK_SET:
@ -734,7 +734,7 @@ ufs_stat(f, sb)
struct open_file *f; struct open_file *f;
struct stat *sb; struct stat *sb;
{ {
register struct file *fp = (struct file *)f->f_fsdata; struct file *fp = (struct file *)f->f_fsdata;
/* only important stuff */ /* only important stuff */
sb->st_mode = fp->f_di.di_mode; sb->st_mode = fp->f_di.di_mode;

4
sys/lib/libsa/write.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: write.c,v 1.8 1999/03/31 01:50:26 cgd Exp $ */ /* $NetBSD: write.c,v 1.9 2000/03/30 12:19:49 augustss Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -73,7 +73,7 @@ write(fd, dest, bcount)
void *dest; void *dest;
size_t bcount; size_t bcount;
{ {
register struct open_file *f = &files[fd]; struct open_file *f = &files[fd];
size_t resid; size_t resid;
#if !defined(LIBSA_NO_FD_CHECKING) #if !defined(LIBSA_NO_FD_CHECKING)

12
sys/lib/libz/inftrees.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inftrees.c,v 1.3 1998/11/01 21:28:51 tron Exp $ */ /* $NetBSD: inftrees.c,v 1.4 2000/03/30 12:19:49 augustss Exp $ */
/* inftrees.c -- generate Huffman trees for efficient decoding /* inftrees.c -- generate Huffman trees for efficient decoding
* Copyright (C) 1995-1998 Mark Adler * Copyright (C) 1995-1998 Mark Adler
@ -115,16 +115,16 @@ uIntf *v; /* working area: values in order of bit length */
uInt f; /* i repeats in table every f entries */ uInt f; /* i repeats in table every f entries */
int g; /* maximum code length */ int g; /* maximum code length */
int h; /* table level */ int h; /* table level */
register uInt i; /* counter, current code */ uInt i; /* counter, current code */
register uInt j; /* counter */ uInt j; /* counter */
register int k; /* number of bits in current code */ int k; /* number of bits in current code */
int l; /* bits per table (returned in m) */ int l; /* bits per table (returned in m) */
uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */ uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */
register uIntf *p; /* pointer into c[], b[], or v[] */ uIntf *p; /* pointer into c[], b[], or v[] */
inflate_huft *q; /* points to current table */ inflate_huft *q; /* points to current table */
struct inflate_huft_s r; /* table entry for structure assignment */ struct inflate_huft_s r; /* table entry for structure assignment */
inflate_huft *u[BMAX]; /* table stack */ inflate_huft *u[BMAX]; /* table stack */
register int w; /* bits before this table == (l * h) */ int w; /* bits before this table == (l * h) */
uInt x[BMAX+1]; /* bit offsets, then code stack */ uInt x[BMAX+1]; /* bit offsets, then code stack */
uIntf *xp; /* pointer into x */ uIntf *xp; /* pointer into x */
int y; /* number of dummy codes added */ int y; /* number of dummy codes added */