Skip to content

Commit c5bae0b

Browse files
authored
Merge pull request #253 from bbonev/bump251
Add missing API from 247
2 parents 2e4dd05 + df220ed commit c5bae0b

4 files changed

Lines changed: 21 additions & 2 deletions

File tree

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AC_PREREQ([2.68])
2-
AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues])
3-
AC_SUBST(UDEV_VERSION, 243)
2+
AC_INIT([eudev],[3.2.14],[https://github.com/gentoo/eudev/issues])
3+
AC_SUBST(UDEV_VERSION, 251)
44
AC_CONFIG_SRCDIR([src/udev/udevd.c])
55

66
AC_USE_SYSTEM_EXTENSIONS

src/libudev/libudev-device.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,6 +1825,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev
18251825
return udev_list_get_entry(&udev_device->tags_list);
18261826
}
18271827

1828+
_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device)
1829+
{
1830+
// TODO: eudev database does not support current tags
1831+
return udev_device_get_tags_list_entry(udev_device);
1832+
}
1833+
18281834
/**
18291835
* udev_device_has_tag:
18301836
* @udev_device: udev device
@@ -1848,6 +1854,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta
18481854
return false;
18491855
}
18501856

1857+
_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) {
1858+
// TODO: eudev database does not support current tags
1859+
return udev_device_has_tag(udev_device, tag);
1860+
}
1861+
18511862
#define ENVP_SIZE 128
18521863
#define MONITOR_BUF_SIZE 4096
18531864
static int update_envp_monitor_buf(struct udev_device *udev_device)

src/libudev/libudev.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device);
100100
struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device);
101101
struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device);
102102
struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device);
103+
struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device);
103104
struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device);
104105
const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key);
105106
const char *udev_device_get_driver(struct udev_device *udev_device);
@@ -110,6 +111,7 @@ unsigned long long int udev_device_get_usec_since_initialized(struct udev_device
110111
const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr);
111112
int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value);
112113
int udev_device_has_tag(struct udev_device *udev_device, const char *tag);
114+
int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag);
113115

114116
/*
115117
* udev_monitor

src/libudev/libudev.sym

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,9 @@ global:
118118
udev_queue_flush;
119119
udev_queue_get_fd;
120120
} LIBUDEV_199;
121+
122+
LIBUDEV_247 {
123+
global:
124+
udev_device_has_current_tag;
125+
udev_device_get_current_tags_list_entry;
126+
} LIBUDEV_215;

0 commit comments

Comments
 (0)