int->size_t fixes

This commit was SVN r3224.

src/attribute/attribute.c

@@ -23,7 +23,7 @@
 #define attr_datatype_f d_f_to_c_index
 #define attr_win_f w_f_to_c_index
 
-#define CREATE_KEY() ompi_bitmap_find_and_set_first_unset_bit(key_bitmap)
+#define CREATE_KEY(key) ompi_bitmap_find_and_set_first_unset_bit(key_bitmap, (key))
 
 #define FREE_KEY(key) ompi_bitmap_clear_bit(key_bitmap, (key))
 
@@ -192,8 +192,10 @@ ompi_attr_create_keyval(ompi_attribute_type_t type,
     /* Create a new unique key and fill the hash */
   
     OMPI_THREAD_LOCK(&alock);
-    *key = CREATE_KEY();
+    ret = CREATE_KEY(key);
+    if (OMPI_SUCCESS == ret) {
         ret = ompi_hash_table_set_value_uint32(keyval_hash, *key, attr);
+    }
     OMPI_THREAD_UNLOCK(&alock);
     if (OMPI_SUCCESS != ret) {
 	return ret;

src/class/ompi_free_list.h

@@ -19,10 +19,10 @@ struct mca_mem_pool_t;
 struct ompi_free_list_t
 {
     ompi_list_t super;
-    int fl_max_to_alloc;
-    int fl_num_allocated;
-    int fl_num_per_alloc;
-    int fl_num_waiting;
+    size_t fl_max_to_alloc;
+    size_t fl_num_allocated;
+    size_t fl_num_per_alloc;
+    size_t fl_num_waiting;
     size_t fl_elem_size;
     ompi_class_t* fl_elem_class;
     mca_mpool_base_module_t* fl_mpool;

src/class/ompi_pointer_array.c

@@ -66,7 +66,7 @@ void ompi_pointer_array_destruct(ompi_pointer_array_t *array){
 size_t ompi_pointer_array_add(ompi_pointer_array_t *table, void *ptr)
 {
     void **p;
-    int	i;
+    size_t i;
     size_t index;
 
     if (0) {

src/errhandler/errhandler.c

@@ -166,7 +166,7 @@ ompi_errhandler_t *ompi_errhandler_create(ompi_errhandler_type_t object_type,
  */
 static void ompi_errhandler_construct(ompi_errhandler_t *new_errhandler)
 {
-  int ret_val;
+  size_t ret_val;
 
   /* assign entry in fortran <-> c translation array */
 
@@ -174,7 +174,7 @@ static void ompi_errhandler_construct(ompi_errhandler_t *new_errhandler)
                                    new_errhandler);
   new_errhandler->eh_f_to_c_index = ret_val;
 
-  new_errhandler->eh_fortran_function = 0;
+  new_errhandler->eh_fortran_function = NULL;
 
   new_errhandler->eh_comm_fn      = NULL;
   new_errhandler->eh_win_fn       = NULL;

src/errhandler/errhandler.h

@@ -69,7 +69,7 @@ struct ompi_errhandler_t {
     ompi_errhandler_fortran_handler_fn_t *eh_fort_fn;
 
     /* index in Fortran <-> C translation array */
-    int eh_f_to_c_index;
+    size_t eh_f_to_c_index;
 };
 typedef struct ompi_errhandler_t ompi_errhandler_t;
 

src/mca/base/mca_base_param.c

@@ -53,7 +53,7 @@ static int param_register(const char *type_name, const char *component_name,
                           mca_base_param_storage_t *default_value,
                           mca_base_param_storage_t *file_value,
                           mca_base_param_storage_t *override_value);
-static bool param_lookup(int index, mca_base_param_storage_t *storage,
+static bool param_lookup(size_t index, mca_base_param_storage_t *storage,
                          ompi_hash_table_t *attrs);
 static bool lookup_keyvals(mca_base_param_t *param,
                            mca_base_param_storage_t *storage,
@@ -170,7 +170,7 @@ int mca_base_param_register_string(const char *type_name,
 /*
  * Associate a keyval with a parameter index
  */
-int mca_base_param_kv_associate(int index, int keyval)
+int mca_base_param_kv_associate(size_t index, int keyval)
 {
   size_t len;
   mca_base_param_t *array;
@@ -596,7 +596,7 @@ static int param_register(const char *type_name, const char *component_name,
 /*
  * Lookup a parameter in multiple places
  */
-static bool param_lookup(int index, mca_base_param_storage_t *storage,
+static bool param_lookup(size_t index, mca_base_param_storage_t *storage,
                          ompi_hash_table_t *attrs)
 {
     size_t size;

src/mca/base/mca_base_param.h

@@ -165,7 +165,7 @@ extern "C" {
      * versions will cross reference and attempt to find parameter
      * values on attributes.
      */
-    int mca_base_param_kv_associate(int index, int keyval);
+    int mca_base_param_kv_associate(size_t index, int keyval);
 
     /**
      * Look up an integer MCA parameter.

src/util/bit_ops.h

@@ -52,8 +52,7 @@ static inline int ompi_hibit(int value, int start)
  */
 static inline int ompi_cube_dim(int value) 
 {
-    int dim;
-    size_t size;
+    int dim, size;
 
     for (dim = 0, size = 1; size < value; ++dim, size <<= 1) {
         continue;