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

Changes to compile the next68k bootblocks with 

egcs -Wpointer-arith -Wstrict-prototypes
This closes pr 6653
This commit is contained in:
dbj 1999-03-26 15:41:38 +00:00
parent 35a4f16a60
commit 82347ce33e
5 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/lib/libsa/cd9660.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660.c,v 1.6 1999/02/11 09:10:44 pk Exp $ */ /* $NetBSD: cd9660.c,v 1.7 1999/03/26 15:41:38 dbj Exp $ */
/* /*
* Copyright (C) 1996 Wolfgang Solfrank. * Copyright (C) 1996 Wolfgang Solfrank.
@ -199,22 +199,22 @@ cd9660_open(path, f)
rc = ENOENT; rc = ENOENT;
while (*path) { while (*path) {
if ((void *)pp >= buf + psize) if ((caddr_t)pp >= (caddr_t)buf + psize)
break; break;
if (isonum_722(pp->parent) != parent) if (isonum_722(pp->parent) != parent)
break; break;
if (!pnmatch(path, pp)) { if (!pnmatch(path, pp)) {
pp = (struct ptable_ent *)((void *)pp + PTSIZE(pp)); pp = (struct ptable_ent *)((caddr_t)pp + PTSIZE(pp));
ent++; ent++;
continue; continue;
} }
path += isonum_711(pp->namlen) + 1; path += isonum_711(pp->namlen) + 1;
parent = ent; parent = ent;
bno = isonum_732(pp->block) + isonum_711(pp->extlen); bno = isonum_732(pp->block) + isonum_711(pp->extlen);
while ((void *)pp < buf + psize) { while ((caddr_t)pp < (caddr_t)buf + psize) {
if (isonum_722(pp->parent) == parent) if (isonum_722(pp->parent) == parent)
break; break;
pp = (struct ptable_ent *)((void *)pp + PTSIZE(pp)); pp = (struct ptable_ent *)((caddr_t)pp + PTSIZE(pp));
ent++; ent++;
} }
} }
@ -250,7 +250,7 @@ cd9660_open(path, f)
if (dirmatch(path, dp)) if (dirmatch(path, dp))
break; break;
psize += isonum_711(dp->length); psize += isonum_711(dp->length);
dp = (struct iso_directory_record *)((void *)dp + isonum_711(dp->length)); dp = (struct iso_directory_record *)((caddr_t)dp + isonum_711(dp->length));
} }
if (psize >= dsize) { if (psize >= dsize) {
@ -326,11 +326,11 @@ cd9660_read(f, start, size, resid)
read = off + size; read = off + size;
read -= off; read -= off;
bcopy(buf + off, start, read); bcopy(buf + off, start, read);
start += read; start = (caddr_t)start + read;
fp->off += read; fp->off += read;
size -= read; size -= read;
} else { } else {
start += ISO_DEFAULT_BLOCK_SIZE; start = (caddr_t)start + ISO_DEFAULT_BLOCK_SIZE;
fp->off += ISO_DEFAULT_BLOCK_SIZE; fp->off += ISO_DEFAULT_BLOCK_SIZE;
size -= ISO_DEFAULT_BLOCK_SIZE; size -= ISO_DEFAULT_BLOCK_SIZE;
} }

15
sys/lib/libsa/dev_net.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dev_net.c,v 1.14 1998/06/29 20:25:59 gwr Exp $ */ /* $NetBSD: dev_net.c,v 1.15 1999/03/26 15:41:38 dbj Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -164,13 +164,22 @@ net_close(f)
} }
int int
net_ioctl() net_ioctl(f, cmd, data)
struct open_file *f;
u_long cmd;
void *data;
{ {
return EIO; return EIO;
} }
int int
net_strategy() net_strategy(devdata, rw, blk, size, buf, rsize)
void *devdata;
int rw;
daddr_t blk;
size_t size;
void *buf;
size_t *rsize;
{ {
return EIO; return EIO;
} }

7
sys/lib/libsa/dev_net.h
View File

@ -1,7 +1,6 @@
/* $NetBSD: dev_net.h,v 1.3 1997/03/15 18:12:14 is Exp $ */ /* $NetBSD: dev_net.h,v 1.4 1999/03/26 15:41:38 dbj Exp $ */
int net_open __P((struct open_file *, ...)); int net_open __P((struct open_file *, ...));
int net_close __P((struct open_file *)); int net_close __P((struct open_file *));
int net_ioctl(); int net_ioctl __P((struct open_file *, u_long, void *));
int net_strategy(); int net_strategy __P((void *, int , daddr_t , size_t, void *, size_t *));

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

@ -1,4 +1,4 @@
/* $NetBSD: tftp.c,v 1.4 1999/02/28 00:57:07 kim Exp $ */ /* $NetBSD: tftp.c,v 1.5 1999/03/26 15:41:38 dbj Exp $ */
/* /*
* Copyright (c) 1996 * Copyright (c) 1996
@ -345,7 +345,7 @@ tftp_read(f, addr, size, resid)
bcopy(tftpfile->lastdata.t.th_data + offinblock, bcopy(tftpfile->lastdata.t.th_data + offinblock,
addr, count); addr, count);
addr += count; addr = (caddr_t)addr + count;
tftpfile->off += count; tftpfile->off += count;
size -= count; size -= count;

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

@ -1,4 +1,4 @@
/* $NetBSD: ustarfs.c,v 1.6 1998/12/19 19:24:32 he Exp $ */ /* $NetBSD: ustarfs.c,v 1.7 1999/03/26 15:41:38 dbj Exp $ */
/* [Notice revision 2.2] /* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc. * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@ -468,7 +468,7 @@ ustarfs_read(f, start, size, resid)
seg = infile; seg = infile;
memcpy(start, space512 + bufferoffset, seg); memcpy(start, space512 + bufferoffset, seg);
ustf->uas_fseek += seg; ustf->uas_fseek += seg;
start += seg; start = (caddr_t)start + seg;
size -= seg; size -= seg;
} }
if (resid) if (resid)