Remove some compilation warnings. Change the type of the argument from int* to unsigned int*.

This commit was SVN r2766.

src/datatype/datatype.h

@@ -214,8 +214,8 @@ int ompi_convertor_pack( ompi_convertor_t* pConv,
 			 unsigned int* in_size,
 			 unsigned int* max_data,
 			 int* freeAfter );
-int ompi_convertor_get_packed_size( ompi_convertor_t* pConv, int* pSize );
-int ompi_convertor_get_unpacked_size( ompi_convertor_t* pConv, int* pSize );
+int ompi_convertor_get_packed_size( ompi_convertor_t* pConv, unsigned int* pSize );
+int ompi_convertor_get_unpacked_size( ompi_convertor_t* pConv, unsigned int* pSize );
 int ompi_convertor_create_stack_with_pos( ompi_convertor_t* pConvertor,
 					  int starting_point, int* sizes );
 

src/datatype/dt_pack.c

@@ -839,7 +839,7 @@ ompi_convertor_t* ompi_convertor_get_copy( ompi_convertor_t* pConvertor )
 }
 
 /* Actually we suppose that we can only do receiver side conversion */
-int ompi_convertor_get_packed_size( ompi_convertor_t* pConv, int* pSize )
+int ompi_convertor_get_packed_size( ompi_convertor_t* pConv, unsigned int* pSize )
 {
    if( ompi_ddt_type_size( pConv->pDesc, pSize ) != 0 )
       return OMPI_ERROR;
@@ -848,7 +848,7 @@ int ompi_convertor_get_packed_size( ompi_convertor_t* pConv, int* pSize )
    return OMPI_SUCCESS;
 }
 
-int ompi_convertor_get_unpacked_size( ompi_convertor_t* pConv, int* pSize )
+int ompi_convertor_get_unpacked_size( ompi_convertor_t* pConv, unsigned int* pSize )
 {
    int i;
    dt_desc_t* pData = pConv->pDesc;

src/mpi/c/pack.c

@@ -27,10 +27,10 @@ static const char FUNC_NAME[] = "MPI_Pack";
 int MPI_Pack(void *inbuf, int incount, MPI_Datatype datatype,
              void *outbuf, int outsize, int *position, MPI_Comm comm)
 {
-  int size, rc, freeAfter;
+  int rc, freeAfter;
   ompi_convertor_t *local_convertor;
   struct iovec invec;
-  unsigned int max_data, iov_count;
+  unsigned int size, iov_count;
 
   if (MPI_PARAM_CHECK) {
     OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
@@ -67,9 +67,8 @@ int MPI_Pack(void *inbuf, int incount, MPI_Datatype datatype,
   /* Do the actual packing */
 
   iov_count = 1;
-  max_data = invec.iov_len;
   rc = ompi_convertor_pack( local_convertor, &invec, &iov_count,
-			    &max_data, &freeAfter );
+			    &size, &freeAfter );
   *position += local_convertor->bConverted;
   OBJ_RELEASE(local_convertor);
 

src/mpi/c/unpack.c

@@ -26,10 +26,10 @@ int MPI_Unpack(void *inbuf, int insize, int *position,
                void *outbuf, int outcount, MPI_Datatype datatype,
                MPI_Comm comm) 
 {
-  int size, rc, freeAfter;
+  int rc, freeAfter;
   ompi_convertor_t *local_convertor;
   struct iovec outvec;
-  unsigned int max_data, iov_count;
+  unsigned int size, iov_count;
 
   if (MPI_PARAM_CHECK) {
     OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
@@ -70,9 +70,8 @@ int MPI_Unpack(void *inbuf, int insize, int *position,
 
   /* Do the actual unpacking */
   iov_count = 1;
-  max_data = outvec.iov_len;
   rc = ompi_convertor_unpack( local_convertor, &outvec, &iov_count,
-			      &max_data, &freeAfter );
+			      &size, &freeAfter );
   *position += local_convertor->bConverted;
   OBJ_RELEASE(local_convertor);