i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed two warnings, dunno why they slipped through the other time.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6599 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-02-15 18:58:41 +00:00
parent 81e08ae466
commit 1ea4458dda
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/arch/x86/floppy/floppy.c
+3 -2
View File
@@ -414,15 +414,16 @@ flo_read(floppy_cookie *cookie, off_t position, void *data, size_t *numbytes)
*numbytes = 0; *numbytes = 0;
return err; return err;
} }
toread = MIN(len, sectsize); toread = MIN(len, (size_t)sectsize);
toread = MIN(toread, sectsize - (position % sectsize)); toread = MIN(toread, sectsize - (position % sectsize));
memcpy(data, cookie->flp->master->buffer + position % cylsize/*(sectsize * ) + (position % sectsize)*/, toread); memcpy(data, cookie->flp->master->buffer + position % cylsize/*(sectsize * ) + (position % sectsize)*/, toread);
len -= toread; len -= toread;
bytes_read += toread; bytes_read += toread;
position += toread; position += toread;
} }
// read the middle blocks // read the middle blocks
while (len >= sectsize) { while (len >= (size_t)sectsize) {
TRACE("read: middle %Ld, %ld, %ld\n", position, bytes_read, len); TRACE("read: middle %Ld, %ld, %ld\n", position, bytes_read, len);
// try to read as many sectors as we can // try to read as many sectors as we can