[PATCH] compositor-drm: use udev_device_get_property_value() helper

Kristian Høgsberg hoegsberg at gmail.com
Sun Mar 11 12:57:00 PDT 2012


On Sun, Mar 11, 2012 at 3:07 PM, David Herrmann
<dh.herrmann at googlemail.com> wrote:
> On Sun, Mar 11, 2012 at 8:05 PM, David Herrmann
> <dh.herrmann at googlemail.com> wrote:
>> Udev provides a convenient helper. Use it instead of working with the
>> property-list directly.
>>
>> Signed-off-by: David Herrmann <dh.herrmann at googlemail.com>
>> ---
>>  src/compositor-drm.c |   10 ++++------
>>  1 file changed, 4 insertions(+), 6 deletions(-)
>>
>> diff --git a/src/compositor-drm.c b/src/compositor-drm.c
>> index 27d4512..ba376eb 100644
>> --- a/src/compositor-drm.c
>> +++ b/src/compositor-drm.c
>> @@ -1396,20 +1396,18 @@ update_outputs(struct drm_compositor *ec, struct udev_device *drm_device)
>>  static int
>>  udev_event_is_hotplug(struct drm_compositor *ec, struct udev_device *device)
>>  {
>> -       struct udev_list_entry *list, *hotplug_entry;
>>        const char *sysnum;
>> +       const char *val;
>>
>>        sysnum = udev_device_get_sysnum(device);
>>        if (!sysnum || atoi(sysnum) != ec->drm.id)
>>                return 0;
>>
>> -       list = udev_device_get_properties_list_entry(device);
>> -
>> -       hotplug_entry = udev_list_entry_get_by_name(list, "HOTPLUG");
>> -       if (hotplug_entry == NULL)
>> +       val = udev_device_get_property_value(device, "HOTPLUG");
>> +       if (!val)
>>                return 0;
>>
>> -       return strcmp(udev_list_entry_get_value(hotplug_entry), "1") == 0;
>> +       return strcmp(val, "1") == 0;
>>  }
>>
>>  static int
>
> I forgot to mention that it depends on my previous patch:
> [PATCH] compositor-drm: ignore hotplug-events from other devices
> The conflict, if the previous patch is not applied, should be trivial, though.

Looks good, both applied.

Kristian


More information about the wayland-devel mailing list