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

Correct evaluation of assoc introduced on ansification

Browse Source 
Correct some function parameters (in #ifdef'ed out code)
Correct references to ufs in messages and comments
some formatting changes
This commit is contained in:
ws 1996-03-16 20:25:40 +00:00
parent ae815da330
commit abee4409dd
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/isofs/cd9660/cd9660_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vnops.c,v 1.31 1996/03/08 18:13:07 scottr Exp $ */
/* $NetBSD: cd9660_vnops.c,v 1.32 1996/03/16 20:25:40 ws Exp $ */
/*-
* Copyright (c) 1994
@ -397,7 +397,7 @@ iso_uiodir(idp,dp,off)
--idp->ncookies;
}
if ((error = uiomove((caddr_t) dp,dp->d_reclen,idp->uio)) != 0)
if ((error = uiomove((caddr_t)dp, dp->d_reclen, idp->uio)) != 0)
return (error);
idp->uio_off = off;
return (0);
@ -415,7 +415,7 @@ iso_shipdir(idp)
cl = idp->current.d_namlen;
cname = idp->current.d_name;
if ((assoc = (cl > 1)) && *cname == ASSOCCHAR) {
if ((assoc = cl > 1 && *cname == ASSOCCHAR)) {
cl--;
cname++;
}
@ -729,7 +729,7 @@ cd9660_link(v)
struct vop_link_args /* {
struct vnode *a_dvp;
struct vnode *a_vp;
struct componentname *a_cnp;
struct componentname *a_cnp;
} */ *ap = v;
VOP_ABORTOP(ap->a_dvp, ap->a_cnp);
@ -755,7 +755,7 @@ cd9660_symlink(v)
}
/*
* Ufs abort op, called after namei() when a CREATE/DELETE isn't actually
* cd9660 abort op, called after namei() when a CREATE/DELETE isn't actually
* done. If a buffer has been saved in anticipation of a CREATE, delete it.
*/
int
@ -839,8 +839,8 @@ cd9660_unlock(v)
struct proc *p = curproc; /* XXX */
if ((ip->i_flag & IN_LOCKED) == 0) {
vprint("ufs_unlock: unlocked inode", ap->a_vp);
panic("ufs_unlock NOT LOCKED");
vprint("cd9660_unlock: unlocked inode", ap->a_vp);
panic("cd9660_unlock NOT LOCKED");
}
if (p && p->p_pid != ip->i_lockholder && p->p_pid > -1 &&
ip->i_lockholder > -1/* && lockcount++ < 100*/)

6
sys/isofs/cd9660/iso.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: iso.h,v 1.10 1996/02/09 21:32:11 christos Exp $ */
/* $NetBSD: iso.h,v 1.11 1996/03/16 20:25:42 ws Exp $ */
/*-
* Copyright (c) 1994
@ -243,7 +243,7 @@ static __inline int
isonum_723(u_char *p)
#else
isonum_723(p)
u_char *p
u_char *p;
#endif
{
return *(u_int16t *)p;
@ -269,7 +269,7 @@ static __inline int
isonum_723(u_char *p)
#else
isonum_723(p)
u_char *p
u_char *p;
#endif
{
return *(u_int16t *)(p + 2);