[haiku-commits] haiku: hrev47211 - in src: kits/network/libnetapi servers/package

  • From: jessica.l.hamilton@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 8 May 2014 06:47:04 +0200 (CEST)

hrev47211 adds 2 changesets to branch 'master'
old head: 7e9976c58b6dd82c953d5bbfb162ce795c2c6542
new head: edc6d1558e885df793ab3f4d5bc66e145506da0f
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=edc6d15+%5E7e9976c

----------------------------------------------------------------------------

194ce33: DynamicBuffer: remove unneeded size check. CID 604168.

edc6d15: packagekit: fix using free instead of delete[]. CID 1210827.

                         [ Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 5 insertions(+), 7 deletions(-)
src/kits/network/libnetapi/DynamicBuffer.cpp | 10 ++++------
src/servers/package/FSUtils.cpp              |  2 +-

############################################################################

Commit:      194ce33d652a974f4365befc7f48c45e25494e8b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=194ce33
Author:      Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date:        Thu May  8 02:30:24 2014 UTC

DynamicBuffer: remove unneeded size check. CID 604168.

----------------------------------------------------------------------------

diff --git a/src/kits/network/libnetapi/DynamicBuffer.cpp 
b/src/kits/network/libnetapi/DynamicBuffer.cpp
index 3a3c9ec..9f336df 100644
--- a/src/kits/network/libnetapi/DynamicBuffer.cpp
+++ b/src/kits/network/libnetapi/DynamicBuffer.cpp
@@ -23,12 +23,10 @@ DynamicBuffer::DynamicBuffer(size_t initialSize) :
        fDataEnd(0),
        fInit(B_NO_INIT)
 {
-       if (initialSize >= 0) {
-               fBuffer = new (std::nothrow) unsigned char[initialSize];
-               if (fBuffer != NULL) {
-                       fBufferSize = initialSize;
-                       fInit = B_OK;
-               }
+       fBuffer = new (std::nothrow) unsigned char[initialSize];
+       if (fBuffer != NULL) {
+               fBufferSize = initialSize;
+               fInit = B_OK;
        }
 }
 

############################################################################

Revision:    hrev47211
Commit:      edc6d1558e885df793ab3f4d5bc66e145506da0f
URL:         http://cgit.haiku-os.org/haiku/commit/?id=edc6d15
Author:      Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date:        Thu May  8 04:38:13 2014 UTC

packagekit: fix using free instead of delete[]. CID 1210827.

----------------------------------------------------------------------------

diff --git a/src/servers/package/FSUtils.cpp b/src/servers/package/FSUtils.cpp
index 1ac49b8..65f909e 100644
--- a/src/servers/package/FSUtils.cpp
+++ b/src/servers/package/FSUtils.cpp
@@ -119,7 +119,7 @@ FSUtils::CompareFileContent(BPositionIO& content1, 
BPositionIO& content2,
        uint8* buffer1 = new(std::nothrow) uint8[2 * kCompareDataBufferSize];
        if (buffer1 == NULL)
                return B_NO_MEMORY;
-       MemoryDeleter bufferDeleter(buffer1);
+       ArrayDeleter<uint8> bufferDeleter(buffer1);
        uint8* buffer2 = buffer1 + kCompareDataBufferSize;
 
        // compare the data


Other related posts:

  • » [haiku-commits] haiku: hrev47211 - in src: kits/network/libnetapi servers/package - jessica . l . hamilton