Changeset 693

Timestamp:

10/27/09 23:06:47 (4 weeks ago)

Author:

kgao

Message:

remove potential error (int -> MPI_Offset) for mvar operations

Files:

• trunk/src/lib/mpinetcdf.c (modified) (4 diffs)

trunk/src/lib/mpinetcdf.c

@@ -12532 +12532 @@
   cbuf = (void **)malloc(nvars*sizeof(void *)); 
   if (cbuf==NULL) printf("cbuf is NULL!!!\n"); 
-  nelems = malloc(nvars*sizeof(int));
+  nelems = malloc(nvars*sizeof(MPI_Offset));
   if (nelems==NULL) printf("nelems is NULL!!!\n"); 
-  cnelems = malloc(nvars*sizeof(int));
+  cnelems = malloc(nvars*sizeof(MPI_Offset));
   if (cnelems==NULL) printf("cnelems is NULL!!!\n"); 
   el_size = malloc(nvars*sizeof(int));
@@ -12664 +12664 @@
     xbuf[i]=NULL;
   }
-  if (cbuf[i] != buffers[i] && cbuf[i] != NULL){
-    free(cbuf[i]);
-    cbuf[i]=NULL;
+  if (!iscontig_of_ptypes[i]) {
+    if (cbuf[i] != buffers[i] && cbuf[i] != NULL){
+      free(cbuf[i]);
+      cbuf[i]=NULL;
+    }
   }
 
@@ -12747 +12749 @@
   cbuf = (void **)malloc(nvars*sizeof(void *));
   if (cbuf==NULL) printf("cbuf is NULL!!!\n");
-  nelems = malloc(nvars*sizeof(int));
+  nelems = malloc(nvars*sizeof(MPI_Offset));
   if (nelems==NULL) printf("nelems is NULL!!!\n");
-  cnelems = malloc(nvars*sizeof(int));
+  cnelems = malloc(nvars*sizeof(MPI_Offset));
   if (cnelems==NULL) printf("cnelems is NULL!!!\n");
   el_size = malloc(nvars*sizeof(int));
@@ -12899 +12901 @@
   if (xbuf[i] != cbuf[i] && xbuf[i] != NULL)
     free(xbuf[i]);
-  if (cbuf[i] != buffers[i] && cbuf[i] != NULL)
-    free(cbuf[i]);
+  if (!iscontig_of_ptypes[i]) {
+    if (cbuf[i] != buffers[i] && cbuf[i] != NULL)
+      free(cbuf[i]);
+    }
   } 
   free(varp);