[PATCH 3/3] Xi: fix "discards ''const' qualifier" warnings
Chase Douglas
chase.douglas at canonical.com
Wed May 16 07:55:11 PDT 2012
On 05/16/2012 12:09 AM, Peter Hutterer wrote:
> extinit.c: In function 'XInputExtensionInit':
> extinit.c:1301:29: warning: assignment discards 'const' qualifier from
> pointer target type [enabled by default]
> extinit.c:1303:36: warning: assignment discards 'const' qualifier from
> pointer target type [enabled by default]
>
> property.c: In function 'XIChangeDeviceProperty':
> xiproperty.c:757:39: warning: cast discards '__attribute__((const))'
> qualifier from pointer target type [-Wcast-qual]
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
> Xi/extinit.c | 7 +++++--
> Xi/xiproperty.c | 2 +-
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/Xi/extinit.c b/Xi/extinit.c
> index 4483076..494e887 100644
> --- a/Xi/extinit.c
> +++ b/Xi/extinit.c
> @@ -1137,6 +1137,9 @@ IResetProc(ExtensionEntry * unused)
> EventSwapVector[DevicePresenceNotify] = NotImplemented;
> EventSwapVector[DevicePropertyNotify] = NotImplemented;
> RestoreExtensionEvents();
> +
> + free(xi_all_devices.name);
> + free(xi_all_master_devices.name);
> }
>
> /***********************************************************************
> @@ -1298,9 +1301,9 @@ XInputExtensionInit(void)
> memset(&xi_all_devices, 0, sizeof(xi_all_devices));
> memset(&xi_all_master_devices, 0, sizeof(xi_all_master_devices));
> xi_all_devices.id = XIAllDevices;
> - xi_all_devices.name = "XIAllDevices";
> + xi_all_devices.name = strdup("XIAllDevices");
> xi_all_master_devices.id = XIAllMasterDevices;
> - xi_all_master_devices.name = "XIAllMasterDevices";
> + xi_all_master_devices.name = strdup("XIAllMasterDevices");
>
> inputInfo.all_devices = &xi_all_devices;
> inputInfo.all_master_devices = &xi_all_master_devices;
> diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
> index e17efe4..5f46b54 100644
> --- a/Xi/xiproperty.c
> +++ b/Xi/xiproperty.c
> @@ -754,7 +754,7 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type,
> break;
> }
> if (new_data)
> - memcpy((char *) new_data, (char *) value, len * size_in_bytes);
> + memcpy((char *) new_data, value, len * size_in_bytes);
> if (old_data)
> memcpy((char *) old_data, (char *) prop_value->data,
> prop_value->size * size_in_bytes);
Looks fine to me.
Reviewed-by: Chase Douglas <chase.douglas at canonical.com>
More information about the xorg-devel
mailing list