From 1e1e333d619ddd94f22e2bfcbae8b037c5f908a1 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 16 Oct 2002 06:09:23 +0000
Subject: [PATCH] Cleanups.

committer: mfx <mfx> 1034748563 +0000
---
 src/file.cpp | 14 +++++++-------
 src/util.cpp | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/file.cpp b/src/file.cpp
index a783995b..79e7ffe5 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -88,7 +88,7 @@ FileBase::~FileBase()
 void FileBase::sopen()
 {
     if (_shflags < 0)
-        _fd = ::open(_name,_flags,_mode);
+        _fd = ::open(_name, _flags, _mode);
     else
     {
 #if defined(__DJGPP__)
@@ -96,7 +96,7 @@ void FileBase::sopen()
 #elif defined(__MINT__)
         _fd = ::open(_name,_flags | (_shflags & O_SHMODE), _mode);
 #elif defined(SH_DENYRW)
-        _fd = ::sopen(_name,_flags,_shflags,_mode);
+        _fd = ::sopen(_name, _flags, _shflags, _mode);
 #else
         assert(0);
 #endif
@@ -135,9 +135,9 @@ int FileBase::read(void *buf, int len)
     for (;;)
     {
 #if 1 && defined(__DJGPP__)
-        l = ::_read(_fd,buf,len);
+        l = ::_read(_fd, buf, len);
 #else
-        l = ::read(_fd,buf,len);
+        l = ::read(_fd, buf, len);
 #endif
         if (l < 0)
         {
@@ -155,7 +155,7 @@ int FileBase::read(void *buf, int len)
 
 int FileBase::readx(void *buf, int len)
 {
-    int l = this->read(buf,len);
+    int l = this->read(buf, len);
     if (l != len)
         throwEOFException();
     return l;
@@ -204,7 +204,7 @@ off_t FileBase::tell() const
 {
     if (!isOpen())
         throwIOException("bad tell");
-    off_t l = ::lseek(_fd,0,SEEK_CUR);
+    off_t l = ::lseek(_fd, 0, SEEK_CUR);
     if (l < 0)
         throwIOException("tell error",errno);
     return l;
@@ -340,7 +340,7 @@ bool OutputFile::openStdout(int flags, bool force)
 
 void OutputFile::write(const void *buf, int len)
 {
-    super::write(buf,len);
+    super::write(buf, len);
     bytes_written += len;
 }
 
diff --git a/src/util.cpp b/src/util.cpp
index 3951f58b..7b18f069 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -411,7 +411,7 @@ bool file_exists(const char *name)
     struct stat st;
 
     /* return true if we can open it */
-    fd = open(name, O_RDONLY);
+    fd = open(name, O_RDONLY, 0);
     if (fd >= 0)
     {
         (void) close(fd);
@@ -440,7 +440,7 @@ bool maketempname(char *ofilename, size_t size,
                   const char *ifilename, const char *ext, bool force)
 {
     char *ofext = NULL, *ofname;
-    int ofile = -1;
+    int ofile;
 
     if (size <= 0)
         return false;
@@ -455,14 +455,14 @@ bool maketempname(char *ofilename, size_t size,
         ofext = ofilename + strlen(ofilename);
     strcpy(ofext, ext);
 
-    while (ofile < 1000)
+    for (ofile = 0; ofile < 1000; ofile++)
     {
         assert(strlen(ofilename) < size);
         if (!file_exists(ofilename))
             return true;
         if (!force)
             break;
-        upx_snprintf(ofext, 5, ".%03d", ++ofile);
+        upx_snprintf(ofext, 5, ".%03d", ofile);
     }
 
     ofilename[0] = 0;
@@ -474,7 +474,7 @@ bool makebakname(char *ofilename, size_t size,
                  const char *ifilename, bool force)
 {
     char *ofext = NULL, *ofname;
-    int ofile = -1;
+    int ofile;
 
     if (size <= 0)
         return false;
@@ -495,14 +495,14 @@ bool makebakname(char *ofilename, size_t size,
     else
         ofext[strlen(ofext)-1] = '~';
 
-    while (ofile < 1000)
+    for (ofile = 0; ofile < 1000; ofile++)
     {
         assert(strlen(ofilename) < size);
         if (!file_exists(ofilename))
             return true;
         if (!force)
             break;
-        upx_snprintf(ofext, 5, ".%03d", ++ofile);
+        upx_snprintf(ofext, 5, ".%03d", ofile);
     }
 
     ofilename[0] = 0;