Fix a merge issues with new ROMIO and fix obvious ROMIO bug.

cmr=v1.7.4:reviewer=jsquyres

This commit was SVN r30319.

ompi/mca/io/romio/romio/mpi-io/glue/openmpi/mpio_file.c

@@ -7,6 +7,8 @@
 
 #include "mpioimpl.h"
 
+#include "adio_extern.h"
+
 /* Hooks for allocation of MPI_File handles.
  *
  * Three functions are used in ROMIO for allocation/deallocation
@@ -21,7 +23,7 @@ MPI_File MPIO_File_create(int size)
 {
     MPI_File mpi_fh;
 
-    mpi_fh = (MPI_File) ADIOI_Malloc(size);
+    mpi_fh = (MPI_File) ADIOI_Calloc(size,1);
     return mpi_fh;
 }
 

ompi/mca/io/romio/romio/mpi-io/read.c

@@ -171,7 +171,7 @@ int MPIOI_File_read(MPI_File fh,
     /* --END ERROR HANDLING-- */
 
     if (e32_buf != NULL) {
-        error_code = MPIU_read_external32_conversion_fn(xbuf, datatype,
+        error_code = MPIU_read_external32_conversion_fn(buf, datatype,
                 count, e32_buf);
 	ADIOI_Free(e32_buf);
     }