Changeset 592 for trunk/src2/core

Timestamp:

Feb 25, 2007 8:53:05 PM (17 years ago)

Author:

dkearney

Message:

changed ints to unsigned ints inside of the rappture buffer object and fixed some corner cases.
adjusted the Ptr.h and Outcome.[h,cpp] files to get rid of warnings from not returning the correct data type.

Location:

trunk/src2/core

Files:

• Outcome.cpp (modified) (6 diffs)
• Outcome.h (modified) (2 diffs)
• Ptr.h (modified) (2 diffs)
• RpBuffer.cc (modified) (13 diffs)
• RpBuffer.h (modified) (2 diffs)

trunk/src2/core/Outcome.cpp

@@ -4 +4 @@
  *
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2007  Purdue Research Foundation
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and
@@ -10 +10 @@
  * ======================================================================
  */
-#include "RpOutcome.h"
+#include "Outcome.h"
 
 using namespace Rappture;
@@ -45 +45 @@
 }
 
+/// Destructor
+Outcome::~Outcome()
+{}
+
 /**
  *  Assign an error condition to the outcome.
@@ -54 +58 @@
     _remarkPtr = Ptr<std::string>(new std::string(errmsg));
     _contextPtr.clear();
+    return *this;
 }
 
@@ -65 +70 @@
     _remarkPtr.clear();
     _contextPtr.clear();
+    return *this;
 }
 
@@ -96 +102 @@
         _contextPtr = oc._contextPtr;
     }
+    return *this;
 }
 

trunk/src2/core/Outcome.h

@@ -4 +4 @@
  *
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2007  Purdue Research Foundation
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and
@@ -28 +28 @@
     Outcome(const Outcome& status);
     Outcome& operator=(const Outcome& status);
+    virtual ~Outcome();
 
     virtual Outcome& error(const char* errmsg, int status=1);

trunk/src2/core/Ptr.h

@@ -97 +97 @@
     clear();
     _pc = new PtrCore(ptr);
+    return *this;
 }
 
@@ -108 +109 @@
     clear();
     _pc = ptr._pc;
+    return *this;
 }
 

trunk/src2/core/RpBuffer.cc

@@ -165 +165 @@
  * @return Number of the bytes used in the buffer.
  */
-int
+unsigned int
 SimpleBuffer::size() const
 {
@@ -194 +194 @@
 SimpleBuffer::append(const char* bytes, int nbytes)
 {
-    int newSize = 0;
+    unsigned int newSize = 0;
     char *newBuffer = NULL;
 
@@ -217 +217 @@
     }
 
-    newSize = _size + nbytes;
+    newSize = (unsigned int)(_size + nbytes);
 
     // ensure that our smallest buffer is 200 bytes
@@ -247 +247 @@
     memcpy((void*) (_buf + _size), (void*) bytes, (size_t) nbytes);
 
-    _size = _size + nbytes;
+    _size = _size + (unsigned int) nbytes;
 
     return nbytes;
@@ -262 +262 @@
 SimpleBuffer::read(const char* bytes, int nbytes)
 {
-    int bytesRead = 0;
+    unsigned int bytesRead = 0;
 
     // SimpleBuffer is empty.
@@ -274 +274 @@
     }
 
+    // User specified negative buffer size
+    if (nbytes <= 0) {
+        return 0;
+    }
+
     // make sure we don't read off the end of our buffer
-    if ( (_pos + nbytes) >= _size) {
+    if ( (_pos + nbytes) >= _size ) {
         bytesRead = (_size - _pos);
     }
     else {
-        bytesRead = nbytes;
-    }
-
-    if (bytesRead < 0) {
+        bytesRead = (unsigned int) nbytes;
+    }
+
+    if (bytesRead <= 0) {
         return 0;
     }
@@ -290 +295 @@
     }
 
-    _pos = _pos + bytesRead;
-
-    return bytesRead;
+    _pos = (_pos + bytesRead);
+
+    return (int)bytesRead;
 }
 
@@ -316 +321 @@
             _pos = 0;
         }
-        else if (offset >= _size) {
+        else if (offset >= (int)_size) {
             /* dont go off the end of data */
             _pos = _size - 1;
         }
         else {
-            _pos = _pos + offset;
+            _pos = (unsigned int)(_pos + offset);
         }
     }
@@ -334 +339 @@
         }
         else {
-            _pos = _pos + offset;
+            _pos = (unsigned int)(_pos + offset);
         }
     }
     else if (whence == SEEK_END) {
-        if (offset <= (-1*_size)) {
+        if (offset <= (-1*((int)_size))) {
             /* dont go off the beginning of data */
             _pos = 0;
@@ -347 +352 @@
         }
         else {
-            _pos = (_size - 1) + offset;
+            _pos = (unsigned int)((_size - 1) + offset);
         }
     }
@@ -365 +370 @@
 SimpleBuffer::tell()
 {
-   return _pos;
+   return (int)_pos;
 }
 
@@ -832 +837 @@
 {
     int tBufSize = 0;
-    int tBufAvl = 2*bin.size();
+    unsigned int tBufAvl = 2*bin.size();
     char* tBuf = new char[tBufAvl];
 
@@ -853 +858 @@
 {
     int tBufSize = 0;
-    int tBufAvl = bin.size();
+    unsigned int tBufAvl = bin.size();
     char* tBuf = new char[tBufAvl];
 

trunk/src2/core/RpBuffer.h

@@ -91 +91 @@
 
     const char* bytes() const;
-    int size() const;
+    unsigned int size() const;
 
     SimpleBuffer& clear();
@@ -117 +117 @@
 
     /// Position offset within the buffer's memory
-    int _pos;
+    unsigned int _pos;
 
     /// Size of the used memory in the buffer
-    int _size;
+    unsigned int _size;
 
     /// Total space available in the buffer
-    int _spaceAvl;
+    unsigned int _spaceAvl;
 
     /// State of the last file like operation.