Changeset 1325 for trunk/src/core

Timestamp:

Mar 14, 2009, 4:20:03 PM (16 years ago)

Author:

gah

Message:

Clean up of warnings, outcomes

Location:

trunk/src/core

Files:

• RpDXWriter.cc (modified) (5 diffs)
• RpDXWriter.h (modified) (2 diffs)
• RpOutcome.cc (modified) (3 diffs)
• RpOutcome.h (modified) (2 diffs)

trunk/src/core/RpDXWriter.cc

@@ -210 +210 @@
 
 DXWriter&
-DXWriter::write(FILE *stream)
-{
-    SimpleCharBuffer *dxfile = NULL;
-
-    if (stream == NULL) {
-        fprintf(stderr,"stream is NULL, cannot write to NULL file inside DXWriter::write\n");
-        return *this;
-    }
-
-    dxfile = new SimpleCharBuffer();
-
+DXWriter::write(FILE *f)
+{
+    if (f == NULL) {
+        fprintf(stderr,"FILE is NULL, cannot write to NULL file inside DXWriter::write\n");
+        return *this;
+    }
+    SimpleCharBuffer dxfile;
     _writeDxToBuffer(dxfile);
-    fwrite((const void*)(dxfile->bytes()),1,dxfile->size(),stream);
-
-    delete dxfile;
-
+    ssize_t nWritten;
+    nWritten = fwrite(dxfile.bytes(), 1, dxfile.size(), f);
+    assert(nWritten == (ssize_t)dxfile.size());
     return *this;
 }
@@ -249 +244 @@
 DXWriter::write(char *str)
 {
-    SimpleCharBuffer *dxfile = NULL;
-    int sz = 0;
-
-    dxfile = new SimpleCharBuffer();
+    SimpleCharBuffer dxfile;
+    int sz;
 
     _writeDxToBuffer(dxfile);
-    sz = dxfile->size();
+    sz = dxfile.size();
     str = new char[sz+1];
-    memcpy(str,dxfile->bytes(),sz);
+    memcpy(str, dxfile.bytes(), sz);
     str[sz] = '\0';
-
-    delete dxfile;
-
     return *this;
 }
@@ -273 +263 @@
 
 DXWriter&
-DXWriter::_writeDxToBuffer(SimpleCharBuffer *dxfile)
+DXWriter::_writeDxToBuffer(SimpleCharBuffer &dxfile)
 {
     char b[80];
@@ -281 +271 @@
     // because we know there are at least
     // 400 characters in even our smallest dx file.
-    dxfile->set(512);
-
-    dxfile->append("<ODX>object 1 class gridpositions counts",40);
+    dxfile.set(512);
+
+    dxfile.append("<ODX>object 1 class gridpositions counts",40);
     for (size_t i=0; i < _rank; i++) {
         sprintf(b, " %10lu", (unsigned long)_positions[i]);
-        dxfile->append(b,11);
-    }
-
-    dxfile->append("\norigin");
+        dxfile.append(b,11);
+    }
+
+    dxfile.append("\norigin");
     for (size_t i=0; i < _rank; i++) {
         sprintf(b, " %10g",_origin[i]);
-        dxfile->append(b,11);
+        dxfile.append(b,11);
     }
 
     for (size_t row=0; row < _rank; row++) {
-        dxfile->append("\ndelta");
+        dxfile.append("\ndelta");
         for (size_t col=0; col < _rank; col++) {
             sprintf(b, " %10g",_delta[(_rank*row)+col]);
-            dxfile->append(b,11);
+            dxfile.append(b,11);
         }
     }
 
-    dxfile->append("\nobject 2 class gridconnections counts", 38);
+    dxfile.append("\nobject 2 class gridconnections counts", 38);
     for (size_t i=0; i < _rank; i++) {
         sprintf(b, " %10lu",(unsigned long)_positions[i]);
-        dxfile->append(b,11);
-    }
-
-    dxfile->append("\nattribute \"element type\" string \"cubes\"\n",41);
-    dxfile->append("attribute \"ref\" string \"positions\"\n",35);
+        dxfile.append(b,11);
+    }
+
+    dxfile.append("\nattribute \"element type\" string \"cubes\"\n",41);
+    dxfile.append("attribute \"ref\" string \"positions\"\n",35);
 
     sprintf(b,"object 3 class array type float rank 0 items %lu data follows\n",
         (unsigned long)_dataBuf.nmemb());
-    dxfile->append(b);
+    dxfile.append(b);
 
     _dataBuf.seek(0,SEEK_SET);
@@ -327 +317 @@
         // only that it has 10 sigdigs, so we cannot tell
         // append the size of the data
-        // dxfile->append(b,15);
-        dxfile->append(b);
-    }
-
-    dxfile->append("attribute \"dep\" string \"positions\"\n",35);
-    dxfile->append("object \"density\" class field\n",29);
-    dxfile->append("component \"positions\" value 1\n",30);
-    dxfile->append("component \"connections\" value 2\n",32);
-    dxfile->append("component \"data\" value 3\n",25);
+        // dxfile.append(b,15);
+        dxfile.append(b);
+    }
+
+    dxfile.append("attribute \"dep\" string \"positions\"\n",35);
+    dxfile.append("object \"density\" class field\n",29);
+    dxfile.append("component \"positions\" value 1\n",30);
+    dxfile.append("component \"connections\" value 2\n",32);
+    dxfile.append("component \"data\" value 3\n",25);
 
     return *this;

trunk/src/core/RpDXWriter.h

@@ +1 @@
+
 /*
  * ----------------------------------------------------------------------
@@ -58 +59 @@
     double* _origin;       // array holding coord of origin
 
-    DXWriter& _writeDxToBuffer(SimpleCharBuffer *dxfile);
+    DXWriter& _writeDxToBuffer(SimpleCharBuffer &dxfile);
 };
 

trunk/src/core/RpOutcome.cc

@@ -63 +63 @@
 
 Outcome&
-Outcome::AddError(const char* format, ...)
+Outcome::addError(const char* format, ...)
 {
     char stackSpace[1024];
@@ -138 +138 @@
  *  Query the error remark from an outcome.
  */
-std::string
+const char *
 Outcome::remark() const
 {
-    if (!_remarkPtr.isNull()) {
-        return _remarkPtr->data();
-    }
-    return "";
+    return (!_remarkPtr.isNull()) ? _remarkPtr->data() : "";
 }
 
@@ -164 +161 @@
  *  Query the context stack from an outcome.
  */
-std::string
+
+const char *
 Outcome::context() const
 {
-    if (!_contextPtr.isNull()) {
-        return _contextPtr->data();
-    }
-    return "";
+    return (!_contextPtr.isNull()) ? _contextPtr->data() : "";
 }

trunk/src/core/RpOutcome.h

@@ -31 +31 @@
     virtual ~Outcome();
 
-    Outcome& AddError(const char* format, ...);
+    Outcome& addError(const char* format, ...);
     virtual Outcome& error(const char* errmsg, int status=1);
     virtual Outcome& clear();
@@ -39 +39 @@
     virtual Outcome& operator&=(Outcome status);  // pass-by-value to avoid temp
 
-    virtual std::string remark() const;
+    virtual const char *remark() const;
     virtual Outcome& addContext(const char *rem);
-    virtual std::string context() const;
+    virtual const char *context() const;
 
 private: