Changeset 2529 for trunk

Timestamp:

Sep 20, 2011 8:39:03 PM (13 years ago)

Author:

dkearney

Message:

updating the fortran showdata example and the c++ getFile and fortran's
rp_lib_get_file functions to correctly return the number of bytes written to
the file.

Location:

trunk

Files:

• examples/showdata (added)
• examples/showdata/Makefile (added)
• examples/showdata/showdata.f (added)
• examples/showdata/tool.xml (added)
• src/core/RpBuffer.cc (modified) (1 diff)
• src/core/RpLibraryFInterface.cc (modified) (2 diffs)

trunk/src/core/RpBuffer.cc

@@ -168 +168 @@
     }
     ssize_t nWritten;
-    nWritten = fwrite(bytes(), size(), sizeof(char), f);
+    nWritten = fwrite(bytes(), sizeof(char), size(), f);
     fclose(f);                        // Close the file.
 
     if (nWritten != (ssize_t)size()) {
-        status.addError("can't write %d bytes to \"%s\": %s\n", size(), 
+        status.addError("can't write %d bytes to \"%s\": %s\n", size(),
                         path, strerror(errno));
         return false;

trunk/src/core/RpLibraryFInterface.cc

@@ -618 +618 @@
 {
     size_t nbytes = 0;
-    int ret = 0;
 
     RpLibrary* lib = NULL;
@@ -636 +635 @@
     }
 
-    if (nbytes > 0) {
-        ret = 1;
-    }
-
-    return ret;
+    return nbytes;
 }