[Spice-devel] [PATCH spice-server v3 3/5] red-channel: Separate RedChannelCapabilities

[Christophe Fergeau]

I'd merge that with the next commit.

On Thu, Mar 02, 2017 at 09:16:09AM +0000, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/Makefile.am                |  2 ++
>  server/red-channel-capabilities.c | 22 ++++++++++++++++++++++
>  server/red-channel-capabilities.h | 36 ++++++++++++++++++++++++++++++++++++
>  server/red-channel.h              |  8 +-------
>  4 files changed, 61 insertions(+), 7 deletions(-)
>  create mode 100644 server/red-channel-capabilities.c
>  create mode 100644 server/red-channel-capabilities.h
> 
> diff --git a/server/Makefile.am b/server/Makefile.am
> index a043660..49c0822 100644
> --- a/server/Makefile.am
> +++ b/server/Makefile.am
> @@ -101,6 +101,8 @@ libserver_la_SOURCES =				\
>  	red-channel.h				\
>  	red-channel-client.c			\
>  	red-channel-client.h			\
> +	red-channel-capabilities.c		\
> +	red-channel-capabilities.h		\
>  	red-client.c				\
>  	red-client.h				\
>  	red-common.h				\
> diff --git a/server/red-channel-capabilities.c b/server/red-channel-capabilities.c
> new file mode 100644
> index 0000000..39bde66
> --- /dev/null
> +++ b/server/red-channel-capabilities.c
> @@ -0,0 +1,22 @@
> +/*
> +   Copyright (C) 2017 Red Hat, Inc.
> +
> +   This library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   This library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with this library; if not, see <http://www.gnu.org/licenses/>.
> +*/
> +#ifdef HAVE_CONFIG_H
> +#include <config.h>
> +#endif
> +
> +#include "red-channel-capabilities.h"
> +
> diff --git a/server/red-channel-capabilities.h b/server/red-channel-capabilities.h
> new file mode 100644
> index 0000000..8729134
> --- /dev/null
> +++ b/server/red-channel-capabilities.h
> @@ -0,0 +1,36 @@
> +/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
> +/*
> +   Copyright (C) 2009-2017 Red Hat, Inc.
> +
> +   This library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   This library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with this library; if not, see <http://www.gnu.org/licenses/>.
> +*/
> +
> +#ifndef RED_CHANNEL_CAPABILITIES_H_
> +#define RED_CHANNEL_CAPABILITIES_H_
> +
> +#include <stdint.h>
> +#include <glib.h>
> +
> +G_BEGIN_DECLS
> +
> +typedef struct RedChannelCapabilities {
> +    int num_common_caps;
> +    uint32_t *common_caps;
> +    int num_caps;
> +    uint32_t *caps;
> +} RedChannelCapabilities;
> +
> +G_END_DECLS
> +
> +#endif
> diff --git a/server/red-channel.h b/server/red-channel.h
> index 79aee01..6cee35f 100644
> --- a/server/red-channel.h
> +++ b/server/red-channel.h
> @@ -34,6 +34,7 @@
>  #include "reds-stream.h"
>  #include "stat.h"
>  #include "red-pipe-item.h"
> +#include "red-channel-capabilities.h"
>  
>  G_BEGIN_DECLS
>  
> @@ -135,13 +136,6 @@ struct RedChannelClass
>  
>  /* Red Channel interface */
>  
> -typedef struct RedChannelCapabilities {
> -    int num_common_caps;
> -    uint32_t *common_caps;
> -    int num_caps;
> -    uint32_t *caps;
> -} RedChannelCapabilities;
> -
>  GType red_channel_get_type(void) G_GNUC_CONST;
>  
>  void red_channel_add_client(RedChannel *channel, RedChannelClient *rcc);
> -- 
> 2.9.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170302/550ab21b/attachment.sig>