On 10/22/2013 04:47 PM, Alon Levy wrote:
> Our automatically generated marshallers use temporary variables whose
> name is based on the field, without checking for shadowing. This bites
> us in one location that is fixed by this patch. A better solution would
> be to fix the marshaller, but it's more then I want to bite right now.
s/marshaller/generator/
I'll fix it before pushing.
>
> RHBZ: 1021995
> ---
> common/messages.h | 2 +-
> spice.proto | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/common/messages.h b/common/messages.h
> index a8a0eee..8ca5385 100644
> --- a/common/messages.h
> +++ b/common/messages.h
> @@ -542,7 +542,7 @@ typedef struct SpiceMsgcTunnelAddGenericService {
> uint64_t description;
> union {
> SpiceMsgTunnelIpInfo ip;
> - } u;
> + } u2;
> } SpiceMsgcTunnelAddGenericService;
>
> typedef struct SpiceMsgcTunnelRemoveService {
> diff --git a/spice.proto b/spice.proto
> index 04e7ea4..b4920f5 100644
> --- a/spice.proto
> +++ b/spice.proto
> @@ -1210,7 +1210,7 @@ channel TunnelChannel : BaseChannel {
> switch (type) {
> case IPP:
> TunnelIpInfo ip @ctype(SpiceMsgTunnelIpInfo);
> - } u;
> + } u2;
> } @ctype(SpiceMsgcTunnelAddGenericService) service_add = 101;
>
> message {
>
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel