Re: [PATCH 2/3] corotypes: drop deprecated QUORUM_ defines

[Steven Dake <sdake@xxxxxxxxxx>]

Reviewed-by: Steven Dake <sdake@xxxxxxxxxx>

On 02/08/2012 03:44 AM, Fabio M. Di Nitto wrote:
> From: "Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>
> 
> neither corosync or any of the dependencies use it.
> 
> Signed-off-by: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
> ---
>  include/corosync/corotypes.h |   17 -----------------
>  man/votequorum_context_get.3 |    2 +-
>  man/votequorum_context_set.3 |    2 +-
>  3 files changed, 2 insertions(+), 19 deletions(-)
> 
> diff --git a/include/corosync/corotypes.h b/include/corosync/corotypes.h
> index 3ec7ab2..1cd31e8 100644
> --- a/include/corosync/corotypes.h
> +++ b/include/corosync/corotypes.h
> @@ -233,23 +233,6 @@ static inline cs_error_t qb_to_cs_error (int result)
>  #define CPG_ERR_TOO_MANY_GROUPS		CS_ERR_TOO_MANY_GROUPS
>  #define cpg_error_t cs_error_t
>  
> -#define QUORUM_DISPATCH_ONE			CS_DISPATCH_ONE
> -#define QUORUM_DISPATCH_ALL			CS_DISPATCH_ALL
> -#define QUORUM_DISPATCH_BLOCKING	CS_DISPATCH_BLOCKING
> -#define QUORUM_OK					CS_OK
> -#define QUORUM_ERR_LIBRARY			CS_ERR_LIBRARY
> -#define QUORUM_ERR_TIMEOUT			CS_ERR_TIMEOUT
> -#define QUORUM_ERR_TRY_AGAIN		CS_ERR_TRY_AGAIN
> -#define QUORUM_ERR_INVALID_PARAM	CS_ERR_INVALID_PARAM
> -#define QUORUM_ERR_NO_MEMORY		CS_ERR_NO_MEMORY
> -#define QUORUM_ERR_BAD_HANDLE		CS_ERR_BAD_HANDLE
> -#define QUORUM_ERR_ACCESS			CS_ERR_ACCESS
> -#define QUORUM_ERR_NOT_EXIST		CS_ERR_NOT_EXIST
> -#define QUORUM_ERR_EXIST			CS_ERR_EXIST
> -#define QUORUM_ERR_NOT_SUPPORTED	CS_ERR_NOT_SUPPORTED
> -#define QUORUM_ERR_SECURITY			CS_ERR_SECURITY
> -#define quorum_error_t cs_error_t
> -
>  /*
>   * static inline so multiple libraries can link into same binary
>   */
> diff --git a/man/votequorum_context_get.3 b/man/votequorum_context_get.3
> index 29482b0..a8e42d0 100644
> --- a/man/votequorum_context_get.3
> +++ b/man/votequorum_context_get.3
> @@ -44,7 +44,7 @@ The
>  function is used to retrieve the context variable previously stored using
>  .B votequorum_context_set(3)
>  .SH RETURN VALUE
> -This call returns the VOTEQUORUM_OK value if successful, otherwise an error is returned.
> +This call returns the CS_OK value if successful, otherwise an error is returned.
>  .PP
>  .SH ERRORS
>  The errors are undocumented.
> diff --git a/man/votequorum_context_set.3 b/man/votequorum_context_set.3
> index 334f83a..f8ef0af 100644
> --- a/man/votequorum_context_set.3
> +++ b/man/votequorum_context_set.3
> @@ -46,7 +46,7 @@ meaning insire libvotequorum itself and will not be touched by the library. It c
>  be retrieved using
>  .B votequorum_context_get(3)
>  .SH RETURN VALUE
> -This call returns the VOTEQUORUM_OK value if successful, otherwise an error is returned.
> +This call returns the CS_OK value if successful, otherwise an error is returned.
>  .PP
>  .SH ERRORS
>  The errors are undocumented.

_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss