From 71ec1ec5a4f51892edd8797c77150cadf2647610 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 21 Oct 2010 20:00:15 +0000 Subject: [PATCH] backport some stuff from eeze 1.1: lots of formatting cleanups move udev extern into private header another filter added to find_by_type to avoid some disks that randomly crop up with MOUNTABLE SVN revision: 53745 --- legacy/eeze/src/lib/eeze_udev_find.c | 21 +++++++++------------ legacy/eeze/src/lib/eeze_udev_private.c | 2 -- legacy/eeze/src/lib/eeze_udev_syspath.c | 2 -- legacy/eeze/src/lib/eeze_udev_walk.c | 2 -- legacy/eeze/src/lib/eeze_udev_watch.c | 2 -- 5 files changed, 9 insertions(+), 20 deletions(-) diff --git a/legacy/eeze/src/lib/eeze_udev_find.c b/legacy/eeze/src/lib/eeze_udev_find.c index 3d2b4c9f48..05eb4679ad 100644 --- a/legacy/eeze/src/lib/eeze_udev_find.c +++ b/legacy/eeze/src/lib/eeze_udev_find.c @@ -5,8 +5,6 @@ #include #include "eeze_udev_private.h" -extern _udev *udev; - /** * @addtogroup find Find * @@ -67,8 +65,9 @@ eeze_udev_find_similar_from_syspath(const char *syspath) devname = udev_list_entry_get_name(cur); /* verify unlisted device */ - EINA_LIST_FOREACH(ret, l, dev) if (!strcmp(dev, devname)) - continue; + EINA_LIST_FOREACH(ret, l, dev) + if (!strcmp(dev, devname)) + continue; ret = eina_list_prepend(ret, eina_stringshare_add(devname)); device = udev_device_new_from_syspath(udev, devname); @@ -210,6 +209,8 @@ eeze_udev_find_by_type(Eeze_Udev_Type etype, const char *name) udev_enumerate_add_match_subsystem(en, "block"); udev_enumerate_add_match_property(en, "ID_FS_USAGE", "filesystem"); udev_enumerate_add_nomatch_sysattr(en, "capability", "52"); + /* parent node */ + udev_enumerate_add_nomatch_sysattr(en, "capability", "50"); break; case EEZE_UDEV_TYPE_DRIVE_INTERNAL: udev_enumerate_add_match_subsystem(en, "block"); @@ -274,22 +275,18 @@ eeze_udev_find_by_type(Eeze_Udev_Type etype, const char *name) goto out; } } - else - if (etype == EEZE_UDEV_TYPE_DRIVE_INTERNAL) + else if (etype == EEZE_UDEV_TYPE_DRIVE_INTERNAL) { if (udev_device_get_property_value(device, "ID_USB_DRIVER")) goto out; } - else - if (etype == EEZE_UDEV_TYPE_DRIVE_REMOVABLE) + else if (etype == EEZE_UDEV_TYPE_DRIVE_REMOVABLE) { - if (! - (test = udev_device_get_property_value(device, "ID_USB_DRIVER"))) + if (!(test = udev_device_get_property_value(device, "ID_USB_DRIVER"))) goto out; } - if (name) - if (!strstr(devname, name)) + if (name && (!strstr(devname, name))) goto out; ret = eina_list_append(ret, eina_stringshare_add(devname)); diff --git a/legacy/eeze/src/lib/eeze_udev_private.c b/legacy/eeze/src/lib/eeze_udev_private.c index 1de1eb2fb5..3492fae2e0 100644 --- a/legacy/eeze/src/lib/eeze_udev_private.c +++ b/legacy/eeze/src/lib/eeze_udev_private.c @@ -5,8 +5,6 @@ #include #include "eeze_udev_private.h" -extern _udev *udev; - /* * helper function to set up a new device from a syspath * which may or may not include /sys at the beginning diff --git a/legacy/eeze/src/lib/eeze_udev_syspath.c b/legacy/eeze/src/lib/eeze_udev_syspath.c index a66e5b1779..45f144e742 100644 --- a/legacy/eeze/src/lib/eeze_udev_syspath.c +++ b/legacy/eeze/src/lib/eeze_udev_syspath.c @@ -5,8 +5,6 @@ #include #include "eeze_udev_private.h" -extern _udev *udev; - /** * @addtogroup syspath Syspath * diff --git a/legacy/eeze/src/lib/eeze_udev_walk.c b/legacy/eeze/src/lib/eeze_udev_walk.c index df5891d2e2..a46aeac169 100644 --- a/legacy/eeze/src/lib/eeze_udev_walk.c +++ b/legacy/eeze/src/lib/eeze_udev_walk.c @@ -5,8 +5,6 @@ #include #include "eeze_udev_private.h" -extern _udev *udev; - /** * @addtogroup walks Walks * diff --git a/legacy/eeze/src/lib/eeze_udev_watch.c b/legacy/eeze/src/lib/eeze_udev_watch.c index f5b2e6398a..9fb7202d32 100644 --- a/legacy/eeze/src/lib/eeze_udev_watch.c +++ b/legacy/eeze/src/lib/eeze_udev_watch.c @@ -6,8 +6,6 @@ #include #include "eeze_udev_private.h" -extern _udev *udev; - /* opaque */ struct Eeze_Udev_Watch {