Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't use ROSRTL.

Browse source 
svn path=/trunk/; revision=16346
This commit is contained in:
Filip Navara 2005-06-30 14:38:53 +00:00
parent 046d85a84a
commit bc4215dca5
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/drivers/fs/np/rw.c
View file

@ -10,7 +10,6 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <ntifs.h> #include <ntifs.h>
#include <rosrtl/minmax.h>
#include "npfs.h" #include "npfs.h"
#define NDEBUG #define NDEBUG
@ -450,7 +449,7 @@ NpfsRead(IN PDEVICE_OBJECT DeviceObject,
/* Byte stream mode */ /* Byte stream mode */
while (Length > 0 && Fcb->ReadDataAvailable > 0) while (Length > 0 && Fcb->ReadDataAvailable > 0)
{ {
CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); CopyLength = min(Fcb->ReadDataAvailable, Length);
if (Fcb->ReadPtr + CopyLength <= Fcb->Data + Fcb->MaxDataLength) if (Fcb->ReadPtr + CopyLength <= Fcb->Data + Fcb->MaxDataLength)
{ {
memcpy(Buffer, Fcb->ReadPtr, CopyLength); memcpy(Buffer, Fcb->ReadPtr, CopyLength);
@ -494,7 +493,7 @@ NpfsRead(IN PDEVICE_OBJECT DeviceObject,
if (Fcb->ReadDataAvailable) if (Fcb->ReadDataAvailable)
{ {
/* Truncate the message if the receive buffer is too small */ /* Truncate the message if the receive buffer is too small */
CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); CopyLength = min(Fcb->ReadDataAvailable, Length);
memcpy(Buffer, Fcb->Data, CopyLength); memcpy(Buffer, Fcb->Data, CopyLength);
#ifndef NDEBUG #ifndef NDEBUG
@ -694,7 +693,7 @@ NpfsWrite(PDEVICE_OBJECT DeviceObject,
DPRINT("Byte stream mode\n"); DPRINT("Byte stream mode\n");
while (Length > 0 && ReaderFcb->WriteQuotaAvailable > 0) while (Length > 0 && ReaderFcb->WriteQuotaAvailable > 0)
{ {
CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); CopyLength = min(Length, ReaderFcb->WriteQuotaAvailable);
if (ReaderFcb->WritePtr + CopyLength <= ReaderFcb->Data + ReaderFcb->MaxDataLength) if (ReaderFcb->WritePtr + CopyLength <= ReaderFcb->Data + ReaderFcb->MaxDataLength)
{ {
memcpy(ReaderFcb->WritePtr, Buffer, CopyLength); memcpy(ReaderFcb->WritePtr, Buffer, CopyLength);
@ -732,7 +731,7 @@ NpfsWrite(PDEVICE_OBJECT DeviceObject,
DPRINT("Message mode\n"); DPRINT("Message mode\n");
if (Length > 0) if (Length > 0)
{ {
CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); CopyLength = min(Length, ReaderFcb->WriteQuotaAvailable);
memcpy(ReaderFcb->Data, Buffer, CopyLength); memcpy(ReaderFcb->Data, Buffer, CopyLength);
Information = CopyLength; Information = CopyLength;