From: Arlin Davis Date: Tue, 16 Oct 2007 21:02:36 +0000 (-0700) Subject: Minor clean-up of cr/lf X-Git-Tag: dapl-2.0.2-1~6 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9446029979a55e6e477fb31cfdf9ce0dc77ffa8f;p=~ardavis%2Fdapl.git Minor clean-up of cr/lf Signed-off by: Arlin Davis --- diff --git a/dapl/common/dapl_ep_connect.c b/dapl/common/dapl_ep_connect.c index be0157a..cf5b2c5 100755 --- a/dapl/common/dapl_ep_connect.c +++ b/dapl/common/dapl_ep_connect.c @@ -366,23 +366,23 @@ bail: * * DAPL Requirements Version 2.0, 6.6.x * - * Requests that a connection be established - * between the local Endpoint and a remote Endpoint specified by the - * remote_ia_address. This operation is used by the active/client side - * Consumer of the Connection establishment model. - * - * EP must be properly configured for this operation. The EP Communicator - * must be specified. As part of the successful completion of this operation, - * the local Endpoint is bound to a local IA Address if it had these assigned - * before. - * - * The local IP Address, port and protocol are passed to the remote side of - * the requested connection and is available to the remote Consumer in the - * Connection Request of the DAT_CONNECTION_REQUEST_EVENT. - * - * The Consumer-provided private_data is passed to the remote side and is - * provided to the remote Consumer in the Connection Request. Consumers - * can encapsulate any local Endpoint attributes that remote Consumers + * Requests that a connection be established + * between the local Endpoint and a remote Endpoint specified by the + * remote_ia_address. This operation is used by the active/client side + * Consumer of the Connection establishment model. + * + * EP must be properly configured for this operation. The EP Communicator + * must be specified. As part of the successful completion of this operation, + * the local Endpoint is bound to a local IA Address if it had these assigned + * before. + * + * The local IP Address, port and protocol are passed to the remote side of + * the requested connection and is available to the remote Consumer in the + * Connection Request of the DAT_CONNECTION_REQUEST_EVENT. + * + * The Consumer-provided private_data is passed to the remote side and is + * provided to the remote Consumer in the Connection Request. Consumers + * can encapsulate any local Endpoint attributes that remote Consumers * need to know as part of an upper-level protocol. * * Input: diff --git a/dapl/common/dapl_rmr_create.c b/dapl/common/dapl_rmr_create.c index 22418af..2c6e179 100755 --- a/dapl/common/dapl_rmr_create.c +++ b/dapl/common/dapl_rmr_create.c @@ -102,15 +102,15 @@ dapl_rmr_create ( * * DAPL Requirements Version 2.0, 6.7.3.x * - * Creates an RMR that is specific to a single connection at a time. - * - * This operation is relatively heavy. The created RMR can be bound to a - * memory region within the LMR through a lightweight dat_rmr_bind - * operation for EPs that use the pz_handle that generates rmr_context. - * - * If the operation fails (does not return DAT_SUCCESS), the return values - * of rmr_handle are undefined and Consumers should not use it. - * pz_handle provide Consumers a way to restrict access to an RMR by + * Creates an RMR that is specific to a single connection at a time. + * + * This operation is relatively heavy. The created RMR can be bound to a + * memory region within the LMR through a lightweight dat_rmr_bind + * operation for EPs that use the pz_handle that generates rmr_context. + * + * If the operation fails (does not return DAT_SUCCESS), the return values + * of rmr_handle are undefined and Consumers should not use it. + * pz_handle provide Consumers a way to restrict access to an RMR by * authorized connections only. * * diff --git a/dapl/include/dapl.h b/dapl/include/dapl.h index 2e0714d..81cbcf9 100755 --- a/dapl/include/dapl.h +++ b/dapl/include/dapl.h @@ -567,7 +567,7 @@ typedef enum dapl_dto_type DAPL_DTO_TYPE_RDMA_WRITE, DAPL_DTO_TYPE_RDMA_READ, #ifdef DAT_EXTENSIONS - DAPL_DTO_TYPE_EXTENSION, + DAPL_DTO_TYPE_EXTENSION, #endif } DAPL_DTO_TYPE; @@ -1189,9 +1189,9 @@ DAT_RETURN dapl_ia_ha( #ifdef DAT_EXTENSIONS #include -extern DAT_RETURN dapl_extensions( - IN DAT_HANDLE, /* handle */ - IN DAT_EXTENDED_OP, /* extended op */ +extern DAT_RETURN dapl_extensions( + IN DAT_HANDLE, /* handle */ + IN DAT_EXTENDED_OP, /* extended op */ IN va_list); /* argument list */ #endif diff --git a/dat/common/dat_api.c b/dat/common/dat_api.c index baccd97..1415f73 100755 --- a/dat/common/dat_api.c +++ b/dat/common/dat_api.c @@ -1269,39 +1269,39 @@ DAT_RETURN dat_srq_set_lw( low_watermark); } -#ifdef DAT_EXTENSIONS -extern int g_dat_extensions; -DAT_RETURN dat_extension_op( - IN DAT_HANDLE handle, - IN DAT_EXTENDED_OP ext_op, - IN ... ) - -{ - DAT_RETURN status; - DAT_IA_HANDLE dapl_handle; - va_list args; - - /* If not IA handle then just passthrough */ - if (dats_get_ia_handle((unsigned long)handle, - &dapl_handle) != DAT_SUCCESS) - { - dapl_handle = handle; - } - - /* verify provider extension support */ - if (!g_dat_extensions) - { - return DAT_ERROR(DAT_NOT_IMPLEMENTED, 0); - } - - /* extension will validate the handle based on op */ - va_start(args, ext_op); - status = DAT_HANDLE_EXTENDEDOP(dapl_handle, ext_op, args); - va_end(args); - - return status; -} -#endif +#ifdef DAT_EXTENSIONS +extern int g_dat_extensions; +DAT_RETURN dat_extension_op( + IN DAT_HANDLE handle, + IN DAT_EXTENDED_OP ext_op, + IN ... ) + +{ + DAT_RETURN status; + DAT_IA_HANDLE dapl_handle; + va_list args; + + /* If not IA handle then just passthrough */ + if (dats_get_ia_handle((unsigned long)handle, + &dapl_handle) != DAT_SUCCESS) + { + dapl_handle = handle; + } + + /* verify provider extension support */ + if (!g_dat_extensions) + { + return DAT_ERROR(DAT_NOT_IMPLEMENTED, 0); + } + + /* extension will validate the handle based on op */ + va_start(args, ext_op); + status = DAT_HANDLE_EXTENDEDOP(dapl_handle, ext_op, args); + va_end(args); + + return status; +} +#endif /* diff --git a/dat/common/dat_sr.c b/dat/common/dat_sr.c index b719396..ee50375 100755 --- a/dat/common/dat_sr.c +++ b/dat/common/dat_sr.c @@ -380,23 +380,23 @@ dat_sr_provider_open ( data->fini_func = dat_os_library_sym (data->lib_handle, DAT_PROVIDER_FINI_FUNC_STR); - /* Warning: DAT and DAPL libraries not ext compatible */ -#ifdef DAT_EXTENSIONS -{ + /* Warning: DAT and DAPL libraries not ext compatible */ +#ifdef DAT_EXTENSIONS +{ void *fncptr; - - fncptr = dat_os_library_sym(data->lib_handle, - "dapl_extensions"); - - if ((dlerror() != NULL) || (fncptr == NULL)) - { - dat_os_dbg_print(DAT_OS_DBG_TYPE_SR, - "DAT Registry: WARNING: library %s, " - "extended DAT expected extended uDAPL: %s\n", - data->lib_path, strerror(errno)); - } -} -#endif + + fncptr = dat_os_library_sym(data->lib_handle, + "dapl_extensions"); + + if ((dlerror() != NULL) || (fncptr == NULL)) + { + dat_os_dbg_print(DAT_OS_DBG_TYPE_SR, + "DAT Registry: WARNING: library %s, " + "extended DAT expected extended uDAPL: %s\n", + data->lib_path, strerror(errno)); + } +} +#endif if ( NULL != data->init_func ) {