[Spice-devel] [PATCH 1/5] common: constify some declarations

Uri Lublin uril at redhat.com
Thu Feb 4 16:59:04 UTC 2016


On 01/27/2016 06:09 PM, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>   common/log.c        | 2 +-
>   common/marshaller.c | 7 +++++--
>   common/marshaller.h | 2 +-
>   3 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/common/log.c b/common/log.c
> index 607aa82..a9bbebc 100644
> --- a/common/log.c
> +++ b/common/log.c
> @@ -43,7 +43,7 @@ static int abort_level = -1;
>
>   static GLogLevelFlags spice_log_level_to_glib(SpiceLogLevel level)
>   {
> -    static GLogLevelFlags glib_levels[] = {
> +    static const GLogLevelFlags glib_levels[] = {
>           [ SPICE_LOG_LEVEL_ERROR ] = G_LOG_LEVEL_ERROR,
>           [ SPICE_LOG_LEVEL_CRITICAL ] = G_LOG_LEVEL_CRITICAL,
>           [ SPICE_LOG_LEVEL_WARNING ] = G_LOG_LEVEL_WARNING,
> diff --git a/common/marshaller.c b/common/marshaller.c
> index c967371..c1d208e 100644
> --- a/common/marshaller.c
> +++ b/common/marshaller.c
> @@ -347,9 +347,12 @@ uint8_t *spice_marshaller_add(SpiceMarshaller *m, const uint8_t *data, size_t si
>       return ptr;
>   }
>
> -uint8_t *spice_marshaller_add_ref(SpiceMarshaller *m, uint8_t *data, size_t size)
> +uint8_t *spice_marshaller_add_ref(SpiceMarshaller *m, const uint8_t *data, size_t size)
>   {
> -    return spice_marshaller_add_ref_full(m, data, size, NULL, NULL);
> +    /* the cast to no-const here is safe as data is used for writing only if
> +     * free_data pointer is not NULL
> +     */
> +    return spice_marshaller_add_ref_full(m, (uint8_t *) data, size, NULL, NULL);
>   }

Hi Frediano,

Isn't there a potential problem with data being returned as non-const ?
I see currently no caller looks at the data returned.

Regards,
     Uri.





More information about the Spice-devel mailing list