Skip to content

Commit

Permalink
Merge pull request #253 from bbonev/bump251
Browse files Browse the repository at this point in the history
Add missing API from 247
bbonev authored Oct 3, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 2e4dd05 + df220ed commit c5bae0b
Showing 4 changed files with 21 additions and 2 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AC_PREREQ([2.68])
AC_INIT([eudev],[3.2.12],[https://github.com/gentoo/eudev/issues])
AC_SUBST(UDEV_VERSION, 243)
AC_INIT([eudev],[3.2.14],[https://github.com/gentoo/eudev/issues])
AC_SUBST(UDEV_VERSION, 251)
AC_CONFIG_SRCDIR([src/udev/udevd.c])

AC_USE_SYSTEM_EXTENSIONS
11 changes: 11 additions & 0 deletions src/libudev/libudev-device.c
Original file line number Diff line number Diff line change
@@ -1825,6 +1825,12 @@ _public_ struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_dev
return udev_list_get_entry(&udev_device->tags_list);
}

_public_ struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device)
{
// TODO: eudev database does not support current tags
return udev_device_get_tags_list_entry(udev_device);
}

/**
* udev_device_has_tag:
* @udev_device: udev device
@@ -1848,6 +1854,11 @@ _public_ int udev_device_has_tag(struct udev_device *udev_device, const char *ta
return false;
}

_public_ int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag) {
// TODO: eudev database does not support current tags
return udev_device_has_tag(udev_device, tag);
}

#define ENVP_SIZE 128
#define MONITOR_BUF_SIZE 4096
static int update_envp_monitor_buf(struct udev_device *udev_device)
2 changes: 2 additions & 0 deletions src/libudev/libudev.h
Original file line number Diff line number Diff line change
@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device *udev_device);
struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device);
struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device);
struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device);
struct udev_list_entry *udev_device_get_current_tags_list_entry(struct udev_device *udev_device);
struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device);
const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key);
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
const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr);
int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, char *value);
int udev_device_has_tag(struct udev_device *udev_device, const char *tag);
int udev_device_has_current_tag(struct udev_device *udev_device, const char *tag);

/*
* udev_monitor
6 changes: 6 additions & 0 deletions src/libudev/libudev.sym
Original file line number Diff line number Diff line change
@@ -118,3 +118,9 @@ global:
udev_queue_flush;
udev_queue_get_fd;
} LIBUDEV_199;

LIBUDEV_247 {
global:
udev_device_has_current_tag;
udev_device_get_current_tags_list_entry;
} LIBUDEV_215;

0 comments on commit c5bae0b

Please sign in to comment.