diff --git a/udev_device.c b/udev_device.c index df1fb87..9da5117 100644 --- a/udev_device.c +++ b/udev_device.c @@ -11,7 +11,6 @@ #include "udev.h" #include "udev_list.h" -#include "udev_device.h" struct udev_device { @@ -302,7 +301,7 @@ UDEV_EXPORT int udev_device_set_sysattr_value(struct udev_device *udev_device, c return 0; } -const char *udev_device_read_symlink(struct udev_device *udev_device, const char *name) +static const char *udev_device_read_symlink(struct udev_device *udev_device, const char *name) { char link[PATH_MAX], path[PATH_MAX]; @@ -315,7 +314,7 @@ const char *udev_device_read_symlink(struct udev_device *udev_device, const char return strrchr(link, '/') + 1; } -void udev_device_set_properties_from_uevent(struct udev_device *udev_device) +static void udev_device_set_properties_from_uevent(struct udev_device *udev_device) { char *key, *val, line[1024], path[PATH_MAX]; char *sysname, devnode[PATH_MAX]; @@ -379,12 +378,12 @@ void udev_device_set_properties_from_uevent(struct udev_device *udev_device) fclose(file); } -int test_bit(unsigned long int arr[], int bit) +static int test_bit(unsigned long int arr[], int bit) { return arr[bit / LONG_BIT] & (1 << (bit % LONG_BIT)); } -void udev_device_set_properties_from_ioctl(struct udev_device *udev_device) +static void udev_device_set_properties_from_ioctl(struct udev_device *udev_device) { unsigned long int bits[96], key_bits[96], rel_bits[96], abs_bits[96]; const char *subsystem; diff --git a/udev_device.h b/udev_device.h deleted file mode 100644 index ed1b3dd..0000000 --- a/udev_device.h +++ /dev/null @@ -1,4 +0,0 @@ -int test_bit(unsigned long int arr[], int bit); -const char *udev_device_read_symlink(struct udev_device *udev_device, const char *name); -void udev_device_set_properties_from_uevent(struct udev_device *udev_device); -void udev_device_set_properties_from_ioctl(struct udev_device *udev_device); diff --git a/udev_enumerate.c b/udev_enumerate.c index ae3b187..0f9396b 100644 --- a/udev_enumerate.c +++ b/udev_enumerate.c @@ -9,7 +9,6 @@ #include "udev.h" #include "udev_list.h" -#include "udev_enumerate.h" struct udev_enumerate { @@ -95,7 +94,7 @@ UDEV_EXPORT int udev_enumerate_add_match_is_initialized(struct udev_enumerate *u return 0; } -int udev_enumerate_filter_subsystem(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device) +static int udev_enumerate_filter_subsystem(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device) { struct udev_list_entry *list_entry; const char *subsystem; @@ -132,7 +131,7 @@ int udev_enumerate_filter_subsystem(struct udev_enumerate *udev_enumerate, struc return 1; } -int udev_enumerate_filter_sysname(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device) +static int udev_enumerate_filter_sysname(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device) { struct udev_list_entry *list_entry; const char *sysname; @@ -155,7 +154,7 @@ int udev_enumerate_filter_sysname(struct udev_enumerate *udev_enumerate, struct return 0; } -int udev_enumerate_filter_property(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device) +static int udev_enumerate_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; @@ -198,7 +197,7 @@ int udev_enumerate_filter_property(struct udev_enumerate *udev_enumerate, struct return 0; } -int udev_enumerate_filter_sysattr(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device) +static int udev_enumerate_filter_sysattr(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device) { struct udev_list_entry *list_entry; const char *sysattr, *value; @@ -244,7 +243,7 @@ int udev_enumerate_filter_sysattr(struct udev_enumerate *udev_enumerate, struct return 1; } -void udev_enumerate_add_device(struct udev_enumerate *udev_enumerate, const char type, dev_t devnum) +static void udev_enumerate_add_device(struct udev_enumerate *udev_enumerate, const char type, dev_t devnum) { struct udev_device *udev_device; @@ -266,7 +265,7 @@ void udev_enumerate_add_device(struct udev_enumerate *udev_enumerate, const char udev_device_unref(udev_device); } -void udev_enumerate_scan_dir(struct udev_enumerate *udev_enumerate, const char *path) +static void udev_enumerate_scan_dir(struct udev_enumerate *udev_enumerate, const char *path) { char file[PATH_MAX]; struct dirent *de; diff --git a/udev_enumerate.h b/udev_enumerate.h deleted file mode 100644 index 08a97f9..0000000 --- a/udev_enumerate.h +++ /dev/null @@ -1,6 +0,0 @@ -int udev_enumerate_filter_subsystem(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device); -int udev_enumerate_filter_property(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device); -int udev_enumerate_filter_sysname(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device); -int udev_enumerate_filter_sysattr(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device); -void udev_enumerate_add_device(struct udev_enumerate *udev_enumerate, const char type, dev_t devnum); -void udev_enumerate_scan_dir(struct udev_enumerate *udev_enumerate, const char *path);