Changeset 5528

Timestamp:

Jul 18, 2008, 12:20:04 PM (16 years ago)

Author:

ole

Message:

Attempt to fix pointer bug in urs_ext.c

File:

• anuga_core/source/anuga/shallow_water/urs_ext.c (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -110 +110 @@
     {
         printf("Checkpoint 2.1 for urs2sts_ext.c\n");        
-        muxFileNameArray[i] = (char*)malloc((MAX_FILE_NAME_LENGTH + 1)*sizeof(char));
-        
+        
+        fname = PyList_GetItem(filenames, i);
+        if (!PyString_Check(fname)) 
+        {
+            PyErr_SetString(PyExc_ValueError, "filename not a string");
+            return NULL;
+        }       
+        
+        muxFileNameArray[i] = PyString_AsString(fname);
         if (muxFileNameArray[i] == NULL) 
         {
@@ -117 +124 @@
             exit(-1);
         }
-
-        printf("Checkpoint 2.2 for urs2sts_ext.c\n");           
-        fname = PyList_GetItem(filenames, i);
-        printf("Checkpoint 2.3 for urs2sts_ext.c\n");
-                                
-        if (!PyString_Check(fname)) 
-        {
-            PyErr_SetString(PyExc_ValueError, "filename not a string");
-            return NULL;
-        }
-
-        printf("Checkpoint 2.4 for urs2sts_ext.c\n");                   
-        muxFileNameArray[i] = PyString_AsString(fname);
     }
 
@@ -230 +224 @@
     free(weights);
     
+    /*
     for (i = 0; i < numSrc; ++i)
     {
         free(muxFileNameArray[i]);
-    }
+        }*/
     free(muxFileNameArray);