summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--libudev/libudev-device.c11
2 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 0ca351c82d..37840c34b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,9 @@ dist_libexec_SCRIPTS =
# ------------------------------------------------------------------------------
# libudev
# ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=11
-LIBUDEV_REVISION=6
-LIBUDEV_AGE=11
+LIBUDEV_CURRENT=12
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=12
SUBDIRS += libudev/docs
diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index 1ac0760f9e..1d4cb704c2 100644
--- a/libudev/libudev-device.c
+++ b/libudev/libudev-device.c
@@ -1646,17 +1646,18 @@ UDEV_EXPORT struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_
return udev_list_get_entry(&udev_device->tags_list);
}
-int udev_device_has_tag(struct udev_device *udev_device, const char *tag)
+UDEV_EXPORT int udev_device_has_tag(struct udev_device *udev_device, const char *tag)
{
struct udev_list_entry *list_entry;
+ if (udev_device == NULL)
+ return NULL;
if (!udev_device->info_loaded)
udev_device_read_db(udev_device, NULL);
list_entry = udev_device_get_tags_list_entry(udev_device);
- list_entry = udev_list_entry_get_by_name(list_entry, tag);
- if (list_entry != NULL)
- return 1;
- return 0;
+ if (udev_list_entry_get_by_name(list_entry, tag) != NULL)
+ return true;
+ return false;
}
#define ENVP_SIZE 128