Changeset 76 for trunk/src/fortran

Timestamp:

Sep 29, 2005 11:45:32 AM (19 years ago)

Author:

dkearney

Message:

1. cleaned up make files some more, deleted make.inc files
2. updated RpUnits module and Cee and Fortran interfaces
3. changed return values for some fortran interfaces,

error messages not working yet

4. still need to add copy assignment code to RpUnits

Location:

trunk/src/fortran

Files:

• RpFortranCommon.c (added)
• RpUnitsFInterface.cc (added)
• RpUnits_fortran.c (deleted)
• make.inc (deleted)
• rappture_fortran.c (modified) (15 diffs)

trunk/src/fortran/rappture_fortran.c

@@ -1 +1 @@
 #include "rappture_interface.h"
+#include "RpFortranCommon.h"
 #include "RpDict.h"
 #include <string.h>
@@ -294 +295 @@
 int storeObject(PyObject* objectName);
 PyObject* getObject(int objKey);
-char* null_terminate(char* inStr, int len);
+// char* null_terminate(char* inStr, int len);
 
 // global vars
@@ -483 +484 @@
                         )
 {
-    int length_in = 0;
-    int length_out = 0;
-    int i = 0;
+    // int length_in = 0;
+    // int length_out = 0;
+    // int i = 0;
     const char* xmlText = NULL;
 
@@ -509 +510 @@
                         xmlText = retObj;
                     
+                        fortranify(xmlText, retText, retText_len);
+            
+                        /*
                         length_in = strlen(xmlText);
                         length_out = retText_len;
@@ -521 +525 @@
                         }
                         *(retText+length_out-1) = ' ';
+                        */
                         
                         free(retObj);
@@ -768 +773 @@
 {
     int retVal = 0;
-    int i = 0;
-    int length_in = 0;
+    // int i = 0;
+    // int length_in = 0;
 
     PyObject* lib = NULL;
@@ -802 +807 @@
                             // printf("xmlChild = :%s:\n",xmlChild);
                             if (xmlChild) {
+                                fortranify(xmlChild, retText, retText_len);
+
+                                /*
                                 strncpy(retText, xmlChild, retText_len);
                                 length_in = strlen(xmlChild);
@@ -812 +820 @@
                                 }
                                 // *(retText+retText_len-1) = ' ';
+                                */
                             }
                         }
@@ -901 +910 @@
                  )
 {
-    int length_in = 0;
-    int length_out = 0;
-    int i = 0;
+    // int length_in = 0;
+    // int length_out = 0;
+    // int i = 0;
     const char* xmlText = NULL;
 
@@ -923 +932 @@
                 if (xmlText) {
 
+                    fortranify(xmlText, retText, retText_len);
+                    
+                    /*
                     length_in = strlen(xmlText);
                     length_out = retText_len;
@@ -935 +947 @@
                     }
                     *(retText+length_out-1) = ' ';
+                    */
                 }
 
@@ -1210 +1223 @@
 void  rp_lib_xml(int* handle, char* retText, int retText_len)
 {
-    int length_in = 0;
-    int length_out = 0;
-    int i = 0;
+    // int length_in = 0;
+    // int length_out = 0;
+    // int i = 0;
     char* xmlText = NULL;
 
@@ -1225 +1238 @@
                 
                 if (xmlText) {
+
+                    fortranify(xmlText, retText, retText_len);
+
+                    /*
                     length_in = strlen(xmlText);
                     length_out = retText_len;
@@ -1237 +1254 @@
                     }
                     *(retText+length_out-1) = ' ';
+                    */
 
                     free(xmlText);
@@ -1380 +1398 @@
 
 }
-
-/* fix buffer overflow possibility*/
-char* null_terminate(char* inStr, int len)
-{
-    int retVal = 0;
-    char* newStr = NULL;
-    char* current = NULL;
-
-    if (inStr) {
-
-        current = inStr+len-1;
-
-        while ((len > 0) && (isspace(*(current)))) {
-            // dont strip off newlines
-
-            if ( (*(current) == '\f')
-              || (*(current) == '\n')
-              || (*(current) == '\r')
-              || (*(current) == '\t')
-              || (*(current) == '\v') )
-            {
-                break;
-            }
-
-            if (--len) {
-                current--;
-            }
-        }
-
-        newStr = (char*) calloc(len+1,(sizeof(char)));
-        strncpy(newStr,inStr,len);
-        *(newStr+len) = '\0';
-
-        retVal++;
-    }
-
-    // return retVal;
-
-    return newStr;
-}