From 7b002d2901e62c94393447b95c95f860b991c3e0 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Thu, 4 Jan 2001 00:17:37 +0000 Subject: [PATCH] *** empty log message *** --- panda/src/express/patchfile.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/panda/src/express/patchfile.cxx b/panda/src/express/patchfile.cxx index 12ca55bb8e..492c15ac0d 100644 --- a/panda/src/express/patchfile.cxx +++ b/panda/src/express/patchfile.cxx @@ -31,6 +31,7 @@ #endif // Patch File Format /////////////////////////////////////////////// +///// IF THIS CHANGES, UPDATE installerApplyPatch.cxx IN THE INSTALLER //////////////////////////////////////////////////////////////////// // [ HEADER ] // 4 bytes 0xfeebfaab ("magic number") @@ -325,7 +326,7 @@ run(void) { PN_uint32 bytes_left = (PN_uint32)COPY_length; while (bytes_left > 0) { - PN_uint32 bytes_this_time = ((int)bytes_left < buflen) ? bytes_left : buflen; + PN_uint32 bytes_this_time = (int)min(bytes_left, buflen); _origfile_stream.read(_buffer->_buffer, bytes_this_time); _write_stream.write(_buffer->_buffer, bytes_this_time); bytes_left -= bytes_this_time;