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

MIN() -> min()

This commit is contained in:
chopps 1994-05-25 11:32:38 +00:00
parent 7672b8b95b
commit 11a73d2aae
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/adosfs/advnops.c
View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: advnops.c,v 1.3 1994/05/16 05:03:56 chopps Exp $
* $Id: advnops.c,v 1.4 1994/05/25 11:34:15 chopps Exp $
*/
#include <sys/param.h>
#include <sys/vnode.h>
@ -202,7 +202,7 @@ adosfs_read(vp, uio, ioflag, ucp)
size = amp->bsize;
lbn = uio->uio_offset / size;
on = uio->uio_offset % size;
n = MIN((unsigned)(size - on), uio->uio_resid);
n = min((u_int)(size - on), uio->uio_resid);
diff = ap->fsize - uio->uio_offset;
/*
* check for EOF
@ -218,7 +218,7 @@ adosfs_read(vp, uio, ioflag, ucp)
*/
error = bread(vp, lbn, size, NOCRED, &bp);
vp->v_lastr = lbn;
n = MIN(n, size - bp->b_resid);
n = min(n, (u_int)size - bp->b_resid);
if (error) {
brelse(bp);
goto reterr;

6
sys/arch/amiga/amiga/amiga_init.c
View File

@ -1,7 +1,7 @@
/* Authors: Markus Wild, Bryan Ford, Niklas Hallqvist
* Michael L. Hitch - initial 68040 support
*
* $Id: amiga_init.c,v 1.17 1994/05/25 07:58:24 chopps Exp $
* $Id: amiga_init.c,v 1.18 1994/05/25 11:32:38 chopps Exp $
*/
@ -755,8 +755,8 @@ kernel_reload_write(uio)
int c;
/* Continue loading in the kernel image. */
c = MIN(iov->iov_len, kernel_load_endseg - kernel_load_ofs);
c = MIN(c, MAXPHYS);
c = min(iov->iov_len, kernel_load_endseg - kernel_load_ofs);
c = min(c, MAXPHYS);
error = uiomove(kernel_image + kernel_load_ofs, (int)c, uio);
if (error == 0)

10
sys/arch/amiga/amiga/mem.c
View File

@ -38,7 +38,7 @@
* from: Utah $Hdr: mem.c 1.14 90/10/12$
*
* @(#)mem.c 7.5 (Berkeley) 5/7/91
* $Id: mem.c,v 1.9 1994/05/25 07:58:32 chopps Exp $
* $Id: mem.c,v 1.10 1994/05/25 11:32:43 chopps Exp $
*/
/*
@ -104,8 +104,8 @@ mmrw(dev, uio, flags)
? VM_PROT_READ : VM_PROT_WRITE, TRUE);
o = (int)uio->uio_offset & PGOFSET;
c = (u_int)(NBPG - ((int)iov->iov_base & PGOFSET));
c = MIN(c, (u_int)(NBPG - o));
c = MIN(c, (u_int)iov->iov_len);
c = min(c, (u_int)(NBPG - o));
c = min(c, (u_int)iov->iov_len);
error = uiomove((caddr_t)&vmmap[o], (int)c, uio);
pmap_remove(kernel_pmap, (vm_offset_t)vmmap,
(vm_offset_t)&vmmap[NBPG]);
@ -115,7 +115,7 @@ mmrw(dev, uio, flags)
* minor device 1 is kernel memory
*/
case 1:
c = MIN(iov->iov_len, MAXPHYS);
c = min(iov->iov_len, MAXPHYS);
if (!kernacc((caddr_t)(vm_offset_t)uio->uio_offset, c,
uio->uio_rw == UIO_READ ? B_READ : B_WRITE))
return (EFAULT);
@ -145,7 +145,7 @@ mmrw(dev, uio, flags)
malloc(CLBYTES, M_TEMP, M_WAITOK);
bzero(zbuf, CLBYTES);
}
c = MIN(iov->iov_len, CLBYTES);
c = min(iov->iov_len, CLBYTES);
error = uiomove(zbuf, (int)c, uio);
continue;

4
sys/arch/amiga/dev/ite_cc.c
View File

@ -1,5 +1,5 @@
/*
* $Id: ite_cc.c,v 1.16 1994/05/08 05:53:19 chopps Exp $
* $Id: ite_cc.c,v 1.17 1994/05/25 11:33:05 chopps Exp $
*/
#include <sys/param.h>
@ -435,7 +435,7 @@ cursor32(struct ite_softc *ip, int flag)
* draw the cursor
*/
ip->cursorx = MIN(ip->curx, ip->cols-1);
ip->cursorx = min(ip->curx, ip->cols-1);
ip->cursory = ip->cury;
cstart = 0;
cend = ip->ftheight-1;