From 8a946ad9e6ac3474b75301604c86b0c5c4eb6a00 Mon Sep 17 00:00:00 2001 From: illiliti Date: Sat, 18 Jul 2020 05:15:00 +0300 Subject: [PATCH] drop UDEV_EXPORT --- Makefile | 6 ++--- udev.c | 6 ++--- udev.h | 1 - udev_device.c | 58 ++++++++++++++++++++++++------------------------ udev_enumerate.c | 34 ++++++++++++++-------------- udev_hwdb.c | 8 +++---- udev_list.c | 8 +++---- udev_monitor.c | 24 ++++++++++---------- 8 files changed, 71 insertions(+), 74 deletions(-) diff --git a/Makefile b/Makefile index 832c650..ab17fb7 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,8 @@ PREFIX = /usr/local LIBDIR = ${PREFIX}/lib INCLUDEDIR = ${PREFIX}/include -XCFLAGS = ${CFLAGS} -std=c99 -fPIC -fvisibility=hidden \ - -D_POSIX_VERSION=200809L -D_XOPEN_SOURCE=700 \ - -Wall -Wextra -Wpedantic -Wmissing-prototypes \ - -Wstrict-prototypes -Wno-unused-parameter +XCFLAGS = ${CFLAGS} -std=c99 -fPIC -D_POSIX_VERSION=200809L -D_XOPEN_SOURCE=700 \ + -Wall -Wextra -Wpedantic -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter XLDFLAGS = ${LDFLAGS} -shared -Wl,-soname,libudev.so.1 XARFLAGS = -rc diff --git a/udev.c b/udev.c index f123cfc..0b4a3d0 100644 --- a/udev.c +++ b/udev.c @@ -6,7 +6,7 @@ struct udev { int refcount; }; -UDEV_EXPORT struct udev *udev_new(void) +struct udev *udev_new(void) { struct udev *udev; @@ -14,7 +14,7 @@ UDEV_EXPORT struct udev *udev_new(void) return udev; } -UDEV_EXPORT struct udev *udev_ref(struct udev *udev) +struct udev *udev_ref(struct udev *udev) { if (!udev) { return NULL; @@ -24,7 +24,7 @@ UDEV_EXPORT struct udev *udev_ref(struct udev *udev) return udev; } -UDEV_EXPORT struct udev *udev_unref(struct udev *udev) +struct udev *udev_unref(struct udev *udev) { if (!udev) { return NULL; diff --git a/udev.h b/udev.h index ed9d056..9ce8619 100644 --- a/udev.h +++ b/udev.h @@ -4,7 +4,6 @@ extern "C" { #endif -#define UDEV_EXPORT __attribute__ ((visibility("default"))) #define udev_list_entry_foreach(list_entry, first_entry) \ for (list_entry = first_entry; list_entry; list_entry = udev_list_entry_get_next(list_entry)) diff --git a/udev_device.c b/udev_device.c index c28709f..60194b2 100644 --- a/udev_device.c +++ b/udev_device.c @@ -20,7 +20,7 @@ struct udev_device { int refcount; }; -UDEV_EXPORT const char *udev_device_get_syspath(struct udev_device *udev_device) +const char *udev_device_get_syspath(struct udev_device *udev_device) { if (!udev_device) { return NULL; @@ -29,7 +29,7 @@ UDEV_EXPORT const char *udev_device_get_syspath(struct udev_device *udev_device) return udev_device_get_property_value(udev_device, "SYSPATH"); } -UDEV_EXPORT const char *udev_device_get_sysname(struct udev_device *udev_device) +const char *udev_device_get_sysname(struct udev_device *udev_device) { const char *sysname; @@ -48,7 +48,7 @@ UDEV_EXPORT const char *udev_device_get_sysname(struct udev_device *udev_device) return NULL; } -UDEV_EXPORT const char *udev_device_get_sysnum(struct udev_device *udev_device) +const char *udev_device_get_sysnum(struct udev_device *udev_device) { if (!udev_device) { return NULL; @@ -57,7 +57,7 @@ UDEV_EXPORT const char *udev_device_get_sysnum(struct udev_device *udev_device) return udev_device_get_property_value(udev_device, "SYSNUM"); } -UDEV_EXPORT const char *udev_device_get_devpath(struct udev_device *udev_device) +const char *udev_device_get_devpath(struct udev_device *udev_device) { if (!udev_device) { return NULL; @@ -66,7 +66,7 @@ UDEV_EXPORT const char *udev_device_get_devpath(struct udev_device *udev_device) return udev_device_get_property_value(udev_device, "DEVPATH"); } -UDEV_EXPORT const char *udev_device_get_devnode(struct udev_device *udev_device) +const char *udev_device_get_devnode(struct udev_device *udev_device) { if (!udev_device) { return NULL; @@ -75,7 +75,7 @@ UDEV_EXPORT const char *udev_device_get_devnode(struct udev_device *udev_device) return udev_device_get_property_value(udev_device, "DEVNODE"); } -UDEV_EXPORT dev_t udev_device_get_devnum(struct udev_device *udev_device) +dev_t udev_device_get_devnum(struct udev_device *udev_device) { const char *major, *minor; @@ -93,7 +93,7 @@ UDEV_EXPORT dev_t udev_device_get_devnum(struct udev_device *udev_device) return makedev(atoi(major), atoi(minor)); } -UDEV_EXPORT const char *udev_device_get_devtype(struct udev_device *udev_device) +const char *udev_device_get_devtype(struct udev_device *udev_device) { if (!udev_device) { return NULL; @@ -102,7 +102,7 @@ UDEV_EXPORT const char *udev_device_get_devtype(struct udev_device *udev_device) return udev_device_get_property_value(udev_device, "DEVTYPE"); } -UDEV_EXPORT const char *udev_device_get_subsystem(struct udev_device *udev_device) +const char *udev_device_get_subsystem(struct udev_device *udev_device) { if (!udev_device) { return NULL; @@ -111,7 +111,7 @@ UDEV_EXPORT const char *udev_device_get_subsystem(struct udev_device *udev_devic return udev_device_get_property_value(udev_device, "SUBSYSTEM"); } -UDEV_EXPORT const char *udev_device_get_driver(struct udev_device *udev_device) +const char *udev_device_get_driver(struct udev_device *udev_device) { if (!udev_device) { return NULL; @@ -120,12 +120,12 @@ UDEV_EXPORT const char *udev_device_get_driver(struct udev_device *udev_device) return udev_device_get_property_value(udev_device, "DRIVER"); } -UDEV_EXPORT struct udev *udev_device_get_udev(struct udev_device *udev_device) +struct udev *udev_device_get_udev(struct udev_device *udev_device) { return udev_device ? udev_device->udev : NULL; } -UDEV_EXPORT struct udev_device *udev_device_get_parent(struct udev_device *udev_device) +struct udev_device *udev_device_get_parent(struct udev_device *udev_device) { char *tmp, *path; @@ -151,7 +151,7 @@ UDEV_EXPORT struct udev_device *udev_device_get_parent(struct udev_device *udev_ return udev_device->parent; } -UDEV_EXPORT struct udev_device *udev_device_get_parent_with_subsystem_devtype(struct udev_device *udev_device, const char *subsystem, const char *devtype) +struct udev_device *udev_device_get_parent_with_subsystem_devtype(struct udev_device *udev_device, const char *subsystem, const char *devtype) { const char *parent_subsystem, *parent_devtype; struct udev_device *parent; @@ -182,45 +182,45 @@ UDEV_EXPORT struct udev_device *udev_device_get_parent_with_subsystem_devtype(st return NULL; } -UDEV_EXPORT int udev_device_get_is_initialized(struct udev_device *udev_device) +int udev_device_get_is_initialized(struct udev_device *udev_device) { return 1; } -UDEV_EXPORT const char *udev_device_get_action(struct udev_device *udev_device) +const char *udev_device_get_action(struct udev_device *udev_device) { return NULL; } -UDEV_EXPORT int udev_device_has_tag(struct udev_device *udev_device, const char *tag) +int udev_device_has_tag(struct udev_device *udev_device, const char *tag) { // XXX NOT IMPLEMENTED return 0; } -UDEV_EXPORT struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device) +struct udev_list_entry *udev_device_get_devlinks_list_entry(struct udev_device *udev_device) { // XXX NOT IMPLEMENTED return NULL; } -UDEV_EXPORT struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device) +struct udev_list_entry *udev_device_get_properties_list_entry(struct udev_device *udev_device) { return udev_device ? udev_list_entry_get_next(&udev_device->properties) : NULL; } -UDEV_EXPORT struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device) +struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device *udev_device) { // XXX NOT IMPLEMENTED return NULL; } -UDEV_EXPORT struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device) +struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device *udev_device) { return udev_device ? udev_list_entry_get_next(&udev_device->sysattrs) : NULL; } -UDEV_EXPORT const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key) +const char *udev_device_get_property_value(struct udev_device *udev_device, const char *key) { struct udev_list_entry *list_entry; @@ -228,7 +228,7 @@ UDEV_EXPORT const char *udev_device_get_property_value(struct udev_device *udev_ return udev_list_entry_get_value(list_entry); } -UDEV_EXPORT const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr) +const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const char *sysattr) { struct udev_list_entry *list_entry; char data[1024], path[PATH_MAX]; @@ -268,7 +268,7 @@ UDEV_EXPORT const char *udev_device_get_sysattr_value(struct udev_device *udev_d return udev_list_entry_get_value(list_entry); } -UDEV_EXPORT int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, const char *value) +int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *sysattr, const char *value) { char path[PATH_MAX]; struct stat st; @@ -441,7 +441,7 @@ static void udev_device_set_properties_from_ioctl(struct udev_device *udev_devic close(fd); } -UDEV_EXPORT struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *syspath) +struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *syspath) { char path[PATH_MAX], file[PATH_MAX + 7]; struct udev_device *udev_device; @@ -489,7 +489,7 @@ UDEV_EXPORT struct udev_device *udev_device_new_from_syspath(struct udev *udev, return udev_device; } -UDEV_EXPORT struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, dev_t devnum) +struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, dev_t devnum) { char path[PATH_MAX]; @@ -511,7 +511,7 @@ UDEV_EXPORT struct udev_device *udev_device_new_from_devnum(struct udev *udev, c return udev_device_new_from_syspath(udev, path); } -UDEV_EXPORT struct udev_device *udev_device_new_from_subsystem_sysname(struct udev *udev, const char *subsystem, const char *sysname) +struct udev_device *udev_device_new_from_subsystem_sysname(struct udev *udev, const char *subsystem, const char *sysname) { char *fmt[] = { "/sys/bus/%s/devices/%s", "/sys/class/%s/%s", NULL }; char path[PATH_MAX]; @@ -532,19 +532,19 @@ UDEV_EXPORT struct udev_device *udev_device_new_from_subsystem_sysname(struct ud return NULL; } -UDEV_EXPORT struct udev_device *udev_device_new_from_device_id(struct udev *udev, const char *id) +struct udev_device *udev_device_new_from_device_id(struct udev *udev, const char *id) { // XXX NOT IMPLEMENTED return NULL; } -UDEV_EXPORT struct udev_device *udev_device_new_from_environment(struct udev *udev) +struct udev_device *udev_device_new_from_environment(struct udev *udev) { // XXX NOT IMPLEMENTED return NULL; } -UDEV_EXPORT struct udev_device *udev_device_ref(struct udev_device *udev_device) +struct udev_device *udev_device_ref(struct udev_device *udev_device) { if (!udev_device) { return NULL; @@ -554,7 +554,7 @@ UDEV_EXPORT struct udev_device *udev_device_ref(struct udev_device *udev_device) return udev_device; } -UDEV_EXPORT struct udev_device *udev_device_unref(struct udev_device *udev_device) +struct udev_device *udev_device_unref(struct udev_device *udev_device) { if (!udev_device) { return NULL; diff --git a/udev_enumerate.c b/udev_enumerate.c index 1bb86fe..f37672f 100644 --- a/udev_enumerate.c +++ b/udev_enumerate.c @@ -21,7 +21,7 @@ struct udev_enumerate { int refcount; }; -UDEV_EXPORT int udev_enumerate_add_match_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem) +int udev_enumerate_add_match_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem) { if (!udev_enumerate || !subsystem) { return -1; @@ -30,7 +30,7 @@ UDEV_EXPORT int udev_enumerate_add_match_subsystem(struct udev_enumerate *udev_e return udev_list_entry_add(&udev_enumerate->subsystem_match, subsystem, NULL) ? 0 : -1; } -UDEV_EXPORT int udev_enumerate_add_nomatch_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem) +int udev_enumerate_add_nomatch_subsystem(struct udev_enumerate *udev_enumerate, const char *subsystem) { if (!udev_enumerate || !subsystem) { return -1; @@ -39,7 +39,7 @@ UDEV_EXPORT int udev_enumerate_add_nomatch_subsystem(struct udev_enumerate *udev return udev_list_entry_add(&udev_enumerate->subsystem_nomatch, subsystem, NULL) ? 0 : -1; } -UDEV_EXPORT int udev_enumerate_add_match_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value) +int udev_enumerate_add_match_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value) { if (!udev_enumerate || !sysattr) { return -1; @@ -48,7 +48,7 @@ UDEV_EXPORT int udev_enumerate_add_match_sysattr(struct udev_enumerate *udev_enu return udev_list_entry_add(&udev_enumerate->sysattr_match, sysattr, value) ? 0 : -1; } -UDEV_EXPORT int udev_enumerate_add_nomatch_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value) +int udev_enumerate_add_nomatch_sysattr(struct udev_enumerate *udev_enumerate, const char *sysattr, const char *value) { if (!udev_enumerate || !sysattr) { return -1; @@ -57,7 +57,7 @@ UDEV_EXPORT int udev_enumerate_add_nomatch_sysattr(struct udev_enumerate *udev_e return udev_list_entry_add(&udev_enumerate->sysattr_nomatch, sysattr, value) ? 0 : -1; } -UDEV_EXPORT int udev_enumerate_add_match_property(struct udev_enumerate *udev_enumerate, const char *property, const char *value) +int udev_enumerate_add_match_property(struct udev_enumerate *udev_enumerate, const char *property, const char *value) { if (!udev_enumerate || !property) { return -1; @@ -66,7 +66,7 @@ UDEV_EXPORT int udev_enumerate_add_match_property(struct udev_enumerate *udev_en return udev_list_entry_add(&udev_enumerate->property_match, property, value) ? 0 : -1; } -UDEV_EXPORT int udev_enumerate_add_match_sysname(struct udev_enumerate *udev_enumerate, const char *sysname) +int udev_enumerate_add_match_sysname(struct udev_enumerate *udev_enumerate, const char *sysname) { if (!udev_enumerate || !sysname) { return -1; @@ -75,19 +75,19 @@ UDEV_EXPORT int udev_enumerate_add_match_sysname(struct udev_enumerate *udev_enu return udev_list_entry_add(&udev_enumerate->sysname_match, sysname, NULL) ? 0 : -1; } -UDEV_EXPORT int udev_enumerate_add_match_tag(struct udev_enumerate *udev_enumerate, const char *tag) +int udev_enumerate_add_match_tag(struct udev_enumerate *udev_enumerate, const char *tag) { // XXX NOT IMPLEMENTED return 0; } -UDEV_EXPORT int udev_enumerate_add_match_parent(struct udev_enumerate *udev_enumerate, struct udev_device *parent) +int udev_enumerate_add_match_parent(struct udev_enumerate *udev_enumerate, struct udev_device *parent) { // XXX NOT IMPLEMENTED return 0; } -UDEV_EXPORT int udev_enumerate_add_match_is_initialized(struct udev_enumerate *udev_enumerate) +int udev_enumerate_add_match_is_initialized(struct udev_enumerate *udev_enumerate) { return 0; } @@ -301,35 +301,35 @@ static void udev_enumerate_scan_dir(struct udev_enumerate *udev_enumerate, const closedir(dp); } -UDEV_EXPORT int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate) +int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate) { udev_enumerate_scan_dir(udev_enumerate, "/dev"); return 0; } -UDEV_EXPORT int udev_enumerate_scan_subsystems(struct udev_enumerate *udev_enumerate) +int udev_enumerate_scan_subsystems(struct udev_enumerate *udev_enumerate) { // XXX NOT IMPLEMENTED return 0; } -UDEV_EXPORT struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *udev_enumerate) +struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *udev_enumerate) { return udev_enumerate ? udev_list_entry_get_next(&udev_enumerate->devices) : NULL; } -UDEV_EXPORT int udev_enumerate_add_syspath(struct udev_enumerate *udev_enumerate, const char *syspath) +int udev_enumerate_add_syspath(struct udev_enumerate *udev_enumerate, const char *syspath) { // XXX NOT IMPLEMENTED return 0; } -UDEV_EXPORT struct udev *udev_enumerate_get_udev(struct udev_enumerate *udev_enumerate) +struct udev *udev_enumerate_get_udev(struct udev_enumerate *udev_enumerate) { return udev_enumerate ? udev_enumerate->udev : NULL; } -UDEV_EXPORT struct udev_enumerate *udev_enumerate_new(struct udev *udev) +struct udev_enumerate *udev_enumerate_new(struct udev *udev) { struct udev_enumerate *udev_enumerate; @@ -357,7 +357,7 @@ UDEV_EXPORT struct udev_enumerate *udev_enumerate_new(struct udev *udev) return udev_enumerate; } -UDEV_EXPORT struct udev_enumerate *udev_enumerate_ref(struct udev_enumerate *udev_enumerate) +struct udev_enumerate *udev_enumerate_ref(struct udev_enumerate *udev_enumerate) { if (!udev_enumerate) { return NULL; @@ -367,7 +367,7 @@ UDEV_EXPORT struct udev_enumerate *udev_enumerate_ref(struct udev_enumerate *ude return udev_enumerate; } -UDEV_EXPORT struct udev_enumerate *udev_enumerate_unref(struct udev_enumerate *udev_enumerate) +struct udev_enumerate *udev_enumerate_unref(struct udev_enumerate *udev_enumerate) { if (!udev_enumerate) { return NULL; diff --git a/udev_hwdb.c b/udev_hwdb.c index 1582eb4..c76f479 100644 --- a/udev_hwdb.c +++ b/udev_hwdb.c @@ -2,22 +2,22 @@ #include "udev.h" -UDEV_EXPORT struct udev_hwdb *udev_hwdb_new(struct udev *udev) +struct udev_hwdb *udev_hwdb_new(struct udev *udev) { return NULL; } -UDEV_EXPORT struct udev_hwdb *udev_hwdb_ref(struct udev_hwdb *hwdb) +struct udev_hwdb *udev_hwdb_ref(struct udev_hwdb *hwdb) { return NULL; } -UDEV_EXPORT struct udev_hwdb *udev_hwdb_unref(struct udev_hwdb *hwdb) +struct udev_hwdb *udev_hwdb_unref(struct udev_hwdb *hwdb) { return NULL; } -UDEV_EXPORT struct udev_list_entry *udev_hwdb_get_properties_list_entry(struct udev_hwdb *hwdb, const char *modalias, unsigned int flags) +struct udev_list_entry *udev_hwdb_get_properties_list_entry(struct udev_hwdb *hwdb, const char *modalias, unsigned int flags) { return NULL; } diff --git a/udev_list.c b/udev_list.c index 248317a..d9adfdb 100644 --- a/udev_list.c +++ b/udev_list.c @@ -62,12 +62,12 @@ struct udev_list_entry *udev_list_entry_add(struct udev_list_entry *list_entry, return new; } -UDEV_EXPORT struct udev_list_entry *udev_list_entry_get_next(struct udev_list_entry *list_entry) +struct udev_list_entry *udev_list_entry_get_next(struct udev_list_entry *list_entry) { return list_entry ? list_entry->next : NULL; } -UDEV_EXPORT struct udev_list_entry *udev_list_entry_get_by_name(struct udev_list_entry *list_entry, const char *name) +struct udev_list_entry *udev_list_entry_get_by_name(struct udev_list_entry *list_entry, const char *name) { struct udev_list_entry *tmp; @@ -88,12 +88,12 @@ UDEV_EXPORT struct udev_list_entry *udev_list_entry_get_by_name(struct udev_list return NULL; } -UDEV_EXPORT const char *udev_list_entry_get_name(struct udev_list_entry *list_entry) +const char *udev_list_entry_get_name(struct udev_list_entry *list_entry) { return list_entry ? list_entry->name : NULL; } -UDEV_EXPORT const char *udev_list_entry_get_value(struct udev_list_entry *list_entry) +const char *udev_list_entry_get_value(struct udev_list_entry *list_entry) { return list_entry ? list_entry->value : NULL; } diff --git a/udev_monitor.c b/udev_monitor.c index b943f0b..1e88b70 100644 --- a/udev_monitor.c +++ b/udev_monitor.c @@ -10,52 +10,52 @@ struct udev_monitor { int fd[2]; }; -UDEV_EXPORT struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monitor) +struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monitor) { return (void *)1; } -UDEV_EXPORT int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor) +int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor) { return 0; } -UDEV_EXPORT int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_monitor, int size) +int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_monitor, int size) { return 0; } -UDEV_EXPORT int udev_monitor_get_fd(struct udev_monitor *udev_monitor) +int udev_monitor_get_fd(struct udev_monitor *udev_monitor) { return udev_monitor ? udev_monitor->fd[0] : -1; } -UDEV_EXPORT struct udev *udev_monitor_get_udev(struct udev_monitor *udev_monitor) +struct udev *udev_monitor_get_udev(struct udev_monitor *udev_monitor) { return udev_monitor ? udev_monitor->udev : NULL; } -UDEV_EXPORT int udev_monitor_filter_update(struct udev_monitor *udev_monitor) +int udev_monitor_filter_update(struct udev_monitor *udev_monitor) { return 0; } -UDEV_EXPORT int udev_monitor_filter_remove(struct udev_monitor *udev_monitor) +int udev_monitor_filter_remove(struct udev_monitor *udev_monitor) { return 0; } -UDEV_EXPORT int udev_monitor_filter_add_match_subsystem_devtype(struct udev_monitor *udev_monitor, const char *subsystem, const char *devtype) +int udev_monitor_filter_add_match_subsystem_devtype(struct udev_monitor *udev_monitor, const char *subsystem, const char *devtype) { return 0; } -UDEV_EXPORT int udev_monitor_filter_add_match_tag(struct udev_monitor *udev_monitor, const char *tag) +int udev_monitor_filter_add_match_tag(struct udev_monitor *udev_monitor, const char *tag) { return 0; } -UDEV_EXPORT struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, const char *name) +struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, const char *name) { struct udev_monitor *udev_monitor; int i; @@ -85,7 +85,7 @@ UDEV_EXPORT struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev return udev_monitor; } -UDEV_EXPORT struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor) +struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor) { if (!udev_monitor) { return NULL; @@ -95,7 +95,7 @@ UDEV_EXPORT struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_moni return udev_monitor; } -UDEV_EXPORT struct udev_monitor *udev_monitor_unref(struct udev_monitor *udev_monitor) +struct udev_monitor *udev_monitor_unref(struct udev_monitor *udev_monitor) { int i;