PawletOS/external_libudev-zero
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

various: drop udev_* prefix from static functions

Browse Source
This commit is contained in:
illiliti
2021-05-26 17:55:29 +03:00
parent 0ea1528dfc
commit f44332df5a
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
udev_device.c
+15 -15
View File
@@ -303,12 +303,12 @@ int udev_device_set_sysattr_value(struct udev_device *udev_device, const char *s
return 0;
}
static char *udev_device_read_symlink(struct udev_device *udev_device, const char *name)
static char *read_symlink(const char *syspath, const char *name)
{
char link[PATH_MAX], path[PATH_MAX];
ssize_t len;
snprintf(path, sizeof(path), "%s/%s", udev_device_get_syspath(udev_device), name);
snprintf(path, sizeof(path), "%s/%s", syspath, name);
len = readlink(path, link, sizeof(link));
if (len == -1) {
@@ -319,7 +319,7 @@ static char *udev_device_read_symlink(struct udev_device *udev_device, const cha
return strdup(strrchr(link, '/') + 1);
}
static void udev_device_set_properties_from_uevent(struct udev_device *udev_device)
static void set_properties_from_uevent(struct udev_device *udev_device)
{
char line[LINE_MAX], path[PATH_MAX], devnode[PATH_MAX];
FILE *file;
@@ -360,10 +360,10 @@ static void make_bit(unsigned long *arr, int cnt, const char *str)
for (i = 0, len = strlen(str); len > 0; len--) {
if (str[len] == ' ') {
arr[i++] = strtoul(str + len + 1, NULL, 16);
}
if (i == cnt) {
return;
if (i == cnt) {
return;
}
}
}
@@ -375,7 +375,7 @@ static int test_bit(unsigned long *arr, unsigned long bit)
return arr[BIT_WORD(bit)] & BIT_MASK(bit);
}
static void udev_device_set_properties_from_evdev(struct udev_device *udev_device)
static void set_properties_from_evdev(struct udev_device *udev_device)
{
// https://www.kernel.org/doc/html/latest/driver-api/input.html#c.input_dev
unsigned long prop_bits[BITS_TO_LONGS(INPUT_PROP_CNT)] = {0};
@@ -472,7 +472,7 @@ static void udev_device_set_properties_from_evdev(struct udev_device *udev_devic
}
}
static void udev_device_set_properties_from_props(struct udev_device *udev_device)
static void set_properties_from_props(struct udev_device *udev_device)
{
const char *sysname, *subsystem;
struct udev_device *parent;
@@ -533,8 +533,8 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
udev_list_entry_add(&udev_device->properties, "DEVPATH", path + 4, 0);
sysname = strrchr(path, '/') + 1;
driver = udev_device_read_symlink(udev_device, "driver");
subsystem = udev_device_read_symlink(udev_device, "subsystem");
driver = read_symlink(path, "driver");
subsystem = read_symlink(path, "subsystem");
udev_list_entry_add(&udev_device->properties, "SUBSYSTEM", subsystem, 0);
udev_list_entry_add(&udev_device->properties, "SYSNAME", sysname, 0);
@@ -547,9 +547,9 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
}
}
udev_device_set_properties_from_uevent(udev_device);
udev_device_set_properties_from_evdev(udev_device);
udev_device_set_properties_from_props(udev_device);
set_properties_from_uevent(udev_device);
set_properties_from_evdev(udev_device);
set_properties_from_props(udev_device);
free(driver);
free(subsystem);
@@ -668,8 +668,8 @@ struct udev_device *udev_device_new_from_file(struct udev *udev, const char *pat
return NULL;
}
udev_device_set_properties_from_props(udev_device);
udev_device_set_properties_from_evdev(udev_device);
set_properties_from_props(udev_device);
set_properties_from_evdev(udev_device);
return udev_device;
}
udev_enumerate.c
+12 -12
View File
@@ -73,7 +73,7 @@ int udev_enumerate_add_match_sysname(struct udev_enumerate *udev_enumerate, cons
return 0;
}
static int udev_enumerate_filter_subsystem(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
static int filter_subsystem(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
{
struct udev_list_entry *list_entry;
const char *subsystem;
@@ -110,7 +110,7 @@ static int udev_enumerate_filter_subsystem(struct udev_enumerate *udev_enumerate
return 1;
}
static int udev_enumerate_filter_sysname(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
static int filter_sysname(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
{
struct udev_list_entry *list_entry;
const char *sysname;
@@ -133,7 +133,7 @@ static int udev_enumerate_filter_sysname(struct udev_enumerate *udev_enumerate,
return 0;
}
static int udev_enumerate_filter_property(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
static int filter_property(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
{
const char *property, *property2, *value, *value2;
struct udev_list_entry *list_entry, *list_entry2;
@@ -176,7 +176,7 @@ static int udev_enumerate_filter_property(struct udev_enumerate *udev_enumerate,
return 0;
}
static int udev_enumerate_filter_sysattr(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
static int filter_sysattr(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
{
struct udev_list_entry *list_entry;
const char *sysattr, *value;
@@ -222,7 +222,7 @@ static int udev_enumerate_filter_sysattr(struct udev_enumerate *udev_enumerate,
return 1;
}
static void *udev_enumerate_add_device(void *ptr)
static void *add_device(void *ptr)
{
struct udev_enumerate_thread *thread = ptr;
struct udev_device *udev_device;
@@ -233,10 +233,10 @@ static void *udev_enumerate_add_device(void *ptr)
return NULL;
}
if (!udev_enumerate_filter_subsystem(thread->udev_enumerate, udev_device) ||
!udev_enumerate_filter_sysname(thread->udev_enumerate, udev_device) ||
!udev_enumerate_filter_property(thread->udev_enumerate, udev_device) ||
!udev_enumerate_filter_sysattr(thread->udev_enumerate, udev_device)) {
if (!filter_subsystem(thread->udev_enumerate, udev_device) ||
!filter_sysname(thread->udev_enumerate, udev_device) ||
!filter_property(thread->udev_enumerate, udev_device) ||
!filter_sysattr(thread->udev_enumerate, udev_device)) {
udev_device_unref(udev_device);
return NULL;
}
@@ -254,7 +254,7 @@ static int filter_dot(const struct dirent *de)
return de->d_name[0] != '.';
}
static int udev_enumerate_add_devices(struct udev_enumerate *udev_enumerate, const char *path)
static int scan_devices(struct udev_enumerate *udev_enumerate, const char *path)
{
struct udev_enumerate_thread *thread;
pthread_mutex_t mutex;
@@ -285,7 +285,7 @@ static int udev_enumerate_add_devices(struct udev_enumerate *udev_enumerate, con
thread[i].udev_enumerate = udev_enumerate;
snprintf(thread[i].path, sizeof(thread[i].path), "%s/%s", path, de[i]->d_name);
pthread_create(&thread[i].thread, NULL, udev_enumerate_add_device, &thread[i]);
pthread_create(&thread[i].thread, NULL, add_device, &thread[i]);
}
for (i = 0; i < cnt; i++) {
@@ -312,7 +312,7 @@ int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate)
}
for (i = 0; path[i]; i++) {
if (udev_enumerate_add_devices(udev_enumerate, path[i]) == -1) {
if (scan_devices(udev_enumerate, path[i]) == -1) {
return -1;
}
}
udev_monitor.c
+6 -6
View File
@@ -33,7 +33,7 @@ struct udev_monitor {
int efd;
};
static int udev_monitor_filter_devtype(struct udev_monitor *udev_monitor, struct udev_device *udev_device)
static int filter_devtype(struct udev_monitor *udev_monitor, struct udev_device *udev_device)
{
struct udev_list_entry *list_entry;
const char *devtype;
@@ -60,7 +60,7 @@ static int udev_monitor_filter_devtype(struct udev_monitor *udev_monitor, struct
return 0;
}
static int udev_monitor_filter_subsystem(struct udev_monitor *udev_monitor, struct udev_device *udev_device)
static int filter_subsystem(struct udev_monitor *udev_monitor, struct udev_device *udev_device)
{
struct udev_list_entry *list_entry;
const char *subsystem;
@@ -103,8 +103,8 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
return NULL;
}
if (!udev_monitor_filter_subsystem(udev_monitor, udev_device) ||
!udev_monitor_filter_devtype(udev_monitor, udev_device)) {
if (!filter_subsystem(udev_monitor, udev_device) ||
!filter_devtype(udev_monitor, udev_device)) {
udev_device_unref(udev_device);
return NULL;
}
@@ -112,7 +112,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
return udev_device;
}
static void *udev_monitor_handle_event(void *ptr)
static void *handle_event(void *ptr)
{
struct udev_monitor *udev_monitor = ptr;
struct inotify_event *event;
@@ -173,7 +173,7 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
pthread_barrier_init(&udev_monitor->barrier, NULL, THREADS_MAX + 1);
for (i = 0; i < THREADS_MAX; i++) {
pthread_create(&udev_monitor->thread[i], &attr, udev_monitor_handle_event, udev_monitor);
pthread_create(&udev_monitor->thread[i], &attr, handle_event, udev_monitor);
}
pthread_attr_destroy(&attr);