[haiku-commits] r42177 - haiku/trunk/src/kits/support

From: ingo_weinhold@xxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 14 Jun 2011 13:27:25 +0200 (CEST)
Author: bonefish
Date: 2011-06-14 13:27:24 +0200 (Tue, 14 Jun 2011)
New Revision: 42177
Changeset: https://dev.haiku-os.org/changeset/42177

Modified:
   haiku/trunk/src/kits/support/DataIO.cpp
Log:
Use casts that are more portable.


Modified: haiku/trunk/src/kits/support/DataIO.cpp
===================================================================
--- haiku/trunk/src/kits/support/DataIO.cpp     2011-06-14 11:26:43 UTC (rev 
42176)
+++ haiku/trunk/src/kits/support/DataIO.cpp     2011-06-14 11:27:24 UTC (rev 
42177)
@@ -174,8 +174,8 @@
                return B_BAD_VALUE;
 
        ssize_t sizeRead = 0;
-       if (pos < fLength) {
-               sizeRead = min_c(static_cast<off_t>(size), fLength - pos);
+       if (pos < (off_t)fLength) {
+               sizeRead = min_c((off_t)size, (off_t)fLength - pos);
                memcpy(buffer, fBuffer + pos, sizeRead);
        }
        return sizeRead;
@@ -184,20 +184,20 @@
 
 ssize_t
 BMemoryIO::WriteAt(off_t pos, const void *buffer, size_t size)
-{      
+{
        if (fReadOnly)
                return B_NOT_ALLOWED;
 
        if (buffer == NULL || pos < 0)
                return B_BAD_VALUE;
 
-       ssize_t sizeWritten = 0;        
-       if (pos < fBufferSize) {
-               sizeWritten = min_c(static_cast<off_t>(size), fBufferSize - 
pos);
+       ssize_t sizeWritten = 0;
+       if (pos < (off_t)fBufferSize) {
+               sizeWritten = min_c((off_t)size, (off_t)fBufferSize - pos);
                memcpy(fBuffer + pos, buffer, sizeWritten);
        }
 
-       if (pos + sizeWritten > fLength)
+       if (pos + sizeWritten > (off_t)fLength)
                fLength = pos + sizeWritten;
 
        return sizeWritten;
@@ -213,13 +213,13 @@
                        break;
                case SEEK_CUR:
                        fPosition += position;
-                       break;          
+                       break;
                case SEEK_END:
                        fPosition = fLength + position;
                        break;
                default:
                        break;
-       }       
+       }
        return fPosition;
 }
 
@@ -237,7 +237,7 @@
        if (fReadOnly)
                return B_NOT_ALLOWED;
 
-       if (size > fBufferSize)
+       if (size > (off_t)fBufferSize)
                return B_ERROR;
 
        fLength = size;
@@ -293,8 +293,8 @@
                return B_BAD_VALUE;
 
        ssize_t sizeRead = 0;
-       if (pos < fLength) {
-               sizeRead = min_c(static_cast<off_t>(size), fLength - pos);
+       if (pos < (off_t)fLength) {
+               sizeRead = min_c((off_t)size, (off_t)fLength - pos);
                memcpy(buffer, fData + pos, sizeRead);
        }
        return sizeRead;
@@ -307,7 +307,7 @@
        if (buffer == NULL)
                return B_BAD_VALUE;
 
-       size_t newSize = max_c(pos + size, static_cast<off_t>(fLength));
+       size_t newSize = max_c(pos + (off_t)size, (off_t)fLength);
        status_t error = B_OK;
 
        if (newSize > fMallocSize)
@@ -361,12 +361,12 @@
        } else {
                // size != 0, see, if necessary to resize
                size_t newSize = (size + fBlockSize - 1) / fBlockSize * 
fBlockSize;
-               if (size != fMallocSize) {
+               if (size != (off_t)fMallocSize) {
                        // we need to resize
                        if (char *newData = static_cast<char*>(realloc(fData, 
newSize))) {
                                // set the new area to 0
                                if (newSize > fMallocSize)
-                                       memset(newData + fMallocSize, 0, 
newSize - fMallocSize);                                
+                                       memset(newData + fMallocSize, 0, 
newSize - fMallocSize);
                                fData = newData;
                                fMallocSize = newSize;
                        } else  // couldn't alloc the memory
[haiku-commits] r42177 - haiku/trunk/src/kits/support

Other related posts:
