From: Kay Sievers Date: Thu, 16 Oct 2008 15:30:06 +0000 (+0200) Subject: move udev_device_db to libudev X-Git-Tag: 174~1445 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fc233a874bc93ac82bed7eda1d6967d6281a6fe2 move udev_device_db to libudev --- diff --git a/udev/Makefile.am b/udev/Makefile.am index ff8b27555..9c765ffe9 100644 --- a/udev/Makefile.am +++ b/udev/Makefile.am @@ -16,7 +16,6 @@ common_files = \ udev.h \ udev_rules.h \ udev_sysdeps.h \ - udev_db.c \ udev_device_event.c \ udev_node.c \ udev_rules.c \ @@ -30,6 +29,7 @@ common_files = \ lib/libudev-list.c \ lib/libudev-util.c \ lib/libudev-device.c \ + lib/libudev-device-db-write.c \ lib/libudev-monitor.c \ lib/libudev-enumerate.c \ lib/libudev-queue.c \ diff --git a/udev/udev_db.c b/udev/lib/libudev-device-db-write.c similarity index 100% rename from udev/udev_db.c rename to udev/lib/libudev-device-db-write.c diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h index 5290bc801..040a48b0e 100644 --- a/udev/lib/libudev-private.h +++ b/udev/lib/libudev-private.h @@ -84,6 +84,11 @@ extern int udev_device_get_ignore_remove(struct udev_device *udev_device); extern int udev_device_set_ignore_remove(struct udev_device *udev_device, int ignore); extern void udev_device_set_info_loaded(struct udev_device *device); +/* libudev-device-db-write.c */ +extern int udev_device_update_db(struct udev_device *udev_device); +extern int udev_device_delete_db(struct udev_device *udev_device); +extern int udev_device_rename_db(struct udev_device *udev_device, const char *devpath); + /* libudev-monitor - netlink/unix socket communication */ extern int udev_monitor_send_device(struct udev_monitor *udev_monitor, struct udev_device *udev_device); diff --git a/udev/udev.h b/udev/udev.h index 896a46676..e486df365 100644 --- a/udev/udev.h +++ b/udev/udev.h @@ -101,11 +101,6 @@ extern int udev_node_add(struct udev_device *dev, mode_t mode, const char *owner extern int udev_node_remove(struct udev_device *dev, int test); extern void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old, int test); -/* udev-device-db.c */ -extern int udev_device_update_db(struct udev_device *udev_device); -extern int udev_device_delete_db(struct udev_device *udev_device); -extern int udev_device_rename_db(struct udev_device *udev_device, const char *devpath); - /* udev-util.c */ struct name_entry { struct list_head node;