From ceafa4d17833cdb02f52ea986af3419f7964dd8c Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 19 Oct 2004 23:58:12 +0000 Subject: [PATCH] int->size_t fixes This commit was SVN r3224. --- src/attribute/attribute.c | 8 +++++--- src/class/ompi_free_list.h | 8 ++++---- src/class/ompi_pointer_array.c | 2 +- src/errhandler/errhandler.c | 6 +++--- src/errhandler/errhandler.h | 2 +- src/mca/base/mca_base_param.c | 6 +++--- src/mca/base/mca_base_param.h | 2 +- src/util/bit_ops.h | 3 +-- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/attribute/attribute.c b/src/attribute/attribute.c index 81c1fe9b24..ef0474d97b 100644 --- a/src/attribute/attribute.c +++ b/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 = ompi_hash_table_set_value_uint32(keyval_hash, *key, attr); + 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; diff --git a/src/class/ompi_free_list.h b/src/class/ompi_free_list.h index b5afd8ab26..dafb6c324d 100644 --- a/src/class/ompi_free_list.h +++ b/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; diff --git a/src/class/ompi_pointer_array.c b/src/class/ompi_pointer_array.c index ca71c918da..42c0324a79 100644 --- a/src/class/ompi_pointer_array.c +++ b/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) { diff --git a/src/errhandler/errhandler.c b/src/errhandler/errhandler.c index 512895fd73..5e5e5002f2 100644 --- a/src/errhandler/errhandler.c +++ b/src/errhandler/errhandler.c @@ -166,15 +166,15 @@ 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 */ ret_val = ompi_pointer_array_add(ompi_errhandler_f_to_c_table, - 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; diff --git a/src/errhandler/errhandler.h b/src/errhandler/errhandler.h index 39f720d53b..2d8cc4418b 100644 --- a/src/errhandler/errhandler.h +++ b/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; diff --git a/src/mca/base/mca_base_param.c b/src/mca/base/mca_base_param.c index 4318660cc7..52cb26804c 100644 --- a/src/mca/base/mca_base_param.c +++ b/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; diff --git a/src/mca/base/mca_base_param.h b/src/mca/base/mca_base_param.h index 75f574ebf6..085936522a 100644 --- a/src/mca/base/mca_base_param.h +++ b/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. diff --git a/src/util/bit_ops.h b/src/util/bit_ops.h index f86175862b..40a487d97a 100644 --- a/src/util/bit_ops.h +++ b/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;