Merge pull request #1129 from rhc54/topic/pmixcleanup

Fix some inconsistencies in pmix_status_t vs int declarations. These …

Author: jsquyres

opal/mca/pmix/pmix112/pmix/src/buffer_ops/copy.c

@@ -27,7 +27,7 @@
 #include "src/util/output.h"
 #include "src/buffer_ops/internal.h"
 
-int pmix_bfrop_copy(void **dest, void *src, pmix_data_type_t type)
+ pmix_status_t pmix_bfrop_copy(void **dest, void *src, pmix_data_type_t type)
 {
     pmix_bfrop_type_info_t *info;
 
@@ -51,7 +51,7 @@ int pmix_bfrop_copy(void **dest, void *src, pmix_data_type_t type)
     return info->odti_copy_fn(dest, src, type);
 }
 
-int pmix_bfrop_copy_payload(pmix_buffer_t *dest, pmix_buffer_t *src)
+pmix_status_t pmix_bfrop_copy_payload(pmix_buffer_t *dest, pmix_buffer_t *src)
 {
     size_t to_copy = 0;
     char *ptr;
@@ -80,7 +80,7 @@ int pmix_bfrop_copy_payload(pmix_buffer_t *dest, pmix_buffer_t *src)
 /*
  * STANDARD COPY FUNCTION - WORKS FOR EVERYTHING NON-STRUCTURED
  */
-int pmix_bfrop_std_copy(void **dest, void *src, pmix_data_type_t type)
+ pmix_status_t pmix_bfrop_std_copy(void **dest, void *src, pmix_data_type_t type)
 {
     size_t datasize;
     uint8_t *val = NULL;
@@ -156,7 +156,7 @@ int pmix_bfrop_std_copy(void **dest, void *src, pmix_data_type_t type)
 /*
  * STRING
  */
-int pmix_bfrop_copy_string(char **dest, char *src, pmix_data_type_t type)
+ pmix_status_t pmix_bfrop_copy_string(char **dest, char *src, pmix_data_type_t type)
 {
     if (NULL == src) {  /* got zero-length string/NULL pointer - store NULL */
         *dest = NULL;
@@ -269,7 +269,7 @@ pmix_status_t pmix_value_xfer(pmix_value_t *p, pmix_value_t *src)
 }
 
 /* PMIX_VALUE */
-int pmix_bfrop_copy_value(pmix_value_t **dest, pmix_value_t *src,
+pmix_status_t pmix_bfrop_copy_value(pmix_value_t **dest, pmix_value_t *src,
                           pmix_data_type_t type)
 {
     pmix_value_t *p;
@@ -287,23 +287,23 @@ int pmix_bfrop_copy_value(pmix_value_t **dest, pmix_value_t *src,
     return pmix_value_xfer(p, src);
 }
 
-int pmix_bfrop_copy_info(pmix_info_t **dest, pmix_info_t *src,
+pmix_status_t pmix_bfrop_copy_info(pmix_info_t **dest, pmix_info_t *src,
                          pmix_data_type_t type)
 {
     *dest = (pmix_info_t*)malloc(sizeof(pmix_info_t));
     (void)strncpy((*dest)->key, src->key, PMIX_MAX_KEYLEN);
     return pmix_value_xfer(&(*dest)->value, &src->value);
 }
 
-int pmix_bfrop_copy_buf(pmix_buffer_t **dest, pmix_buffer_t *src,
+pmix_status_t pmix_bfrop_copy_buf(pmix_buffer_t **dest, pmix_buffer_t *src,
                         pmix_data_type_t type)
 {
     *dest = PMIX_NEW(pmix_buffer_t);
     pmix_bfrop.copy_payload(*dest, src);
     return PMIX_SUCCESS;
 }
 
-int pmix_bfrop_copy_app(pmix_app_t **dest, pmix_app_t *src,
+pmix_status_t pmix_bfrop_copy_app(pmix_app_t **dest, pmix_app_t *src,
                         pmix_data_type_t type)
 {
     size_t j;
@@ -323,7 +323,7 @@ int pmix_bfrop_copy_app(pmix_app_t **dest, pmix_app_t *src,
     return PMIX_SUCCESS;
 }
 
-int pmix_bfrop_copy_kval(pmix_kval_t **dest, pmix_kval_t *src,
+pmix_status_t pmix_bfrop_copy_kval(pmix_kval_t **dest, pmix_kval_t *src,
                          pmix_data_type_t type)
 {
     pmix_kval_t *p;
@@ -341,7 +341,7 @@ int pmix_bfrop_copy_kval(pmix_kval_t **dest, pmix_kval_t *src,
     return pmix_value_xfer(p->value, src->value);
 }
 
-int pmix_bfrop_copy_array(pmix_info_array_t **dest,
+pmix_status_t pmix_bfrop_copy_array(pmix_info_array_t **dest,
                           pmix_info_array_t *src,
                           pmix_data_type_t type)
 {
@@ -356,7 +356,7 @@ int pmix_bfrop_copy_array(pmix_info_array_t **dest,
     return PMIX_SUCCESS;
 }
 
-int pmix_bfrop_copy_proc(pmix_proc_t **dest, pmix_proc_t *src,
+pmix_status_t pmix_bfrop_copy_proc(pmix_proc_t **dest, pmix_proc_t *src,
                          pmix_data_type_t type)
 {
     *dest = (pmix_proc_t*)malloc(sizeof(pmix_proc_t));
@@ -369,7 +369,7 @@ int pmix_bfrop_copy_proc(pmix_proc_t **dest, pmix_proc_t *src,
 }
 
 #if PMIX_HAVE_HWLOC
-int pmix_bfrop_copy_topo(hwloc_topology_t *dest,
+pmix_status_t pmix_bfrop_copy_topo(hwloc_topology_t *dest,
                          hwloc_topology_t src,
                          pmix_data_type_t type)
 {
@@ -378,7 +378,7 @@ int pmix_bfrop_copy_topo(hwloc_topology_t *dest,
 }
 #endif
 
-int pmix_bfrop_copy_modex(pmix_modex_data_t **dest, pmix_modex_data_t *src,
+pmix_status_t pmix_bfrop_copy_modex(pmix_modex_data_t **dest, pmix_modex_data_t *src,
                           pmix_data_type_t type)
 {
     *dest = (pmix_modex_data_t*)malloc(sizeof(pmix_modex_data_t));
@@ -398,7 +398,7 @@ int pmix_bfrop_copy_modex(pmix_modex_data_t **dest, pmix_modex_data_t *src,
     return PMIX_SUCCESS;
 }
 
-int pmix_bfrop_copy_persist(pmix_persistence_t **dest, pmix_persistence_t *src,
+pmix_status_t pmix_bfrop_copy_persist(pmix_persistence_t **dest, pmix_persistence_t *src,
                             pmix_data_type_t type)
 {
     *dest = (pmix_persistence_t*)malloc(sizeof(pmix_persistence_t));
@@ -409,7 +409,7 @@ int pmix_bfrop_copy_persist(pmix_persistence_t **dest, pmix_persistence_t *src,
     return PMIX_SUCCESS;
 }
 
-int pmix_bfrop_copy_bo(pmix_byte_object_t **dest, pmix_byte_object_t *src,
+pmix_status_t pmix_bfrop_copy_bo(pmix_byte_object_t **dest, pmix_byte_object_t *src,
                        pmix_data_type_t type)
 {
     *dest = (pmix_byte_object_t*)malloc(sizeof(pmix_byte_object_t));
@@ -422,7 +422,7 @@ int pmix_bfrop_copy_bo(pmix_byte_object_t **dest, pmix_byte_object_t *src,
     return PMIX_SUCCESS;
 }
 
-int pmix_bfrop_copy_pdata(pmix_pdata_t **dest, pmix_pdata_t *src,
+pmix_status_t pmix_bfrop_copy_pdata(pmix_pdata_t **dest, pmix_pdata_t *src,
                           pmix_data_type_t type)
 {
     *dest = (pmix_pdata_t*)malloc(sizeof(pmix_pdata_t));