hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2010-10-21 20:00:15 +00:00
parent ef1b10734e
commit 71ec1ec5a4
5 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/eeze/src/lib/eeze_udev_find.c
View File

@ -5,8 +5,6 @@
#include <Eeze.h>
#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));

2
legacy/eeze/src/lib/eeze_udev_private.c
View File

@ -5,8 +5,6 @@
#include <Eeze.h>
#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

2
legacy/eeze/src/lib/eeze_udev_syspath.c
View File

@ -5,8 +5,6 @@
#include <Eeze.h>
#include "eeze_udev_private.h"
extern _udev *udev;
/**
* @addtogroup syspath Syspath
*

2
legacy/eeze/src/lib/eeze_udev_walk.c
View File

@ -5,8 +5,6 @@
#include <Eeze.h>
#include "eeze_udev_private.h"
extern _udev *udev;
/**
* @addtogroup walks Walks
*

2
legacy/eeze/src/lib/eeze_udev_watch.c
View File

@ -6,8 +6,6 @@
#include <Eeze.h>
#include "eeze_udev_private.h"
extern _udev *udev;
/* opaque */
struct Eeze_Udev_Watch
{