move udev_device_db to libudev

diff --git a/udev/Makefile.am b/udev/Makefile.am
index ff8b2755529b1c85babaf7e39dd0c0bbda40d0a5..9c765ffe96ae9a3c6f5ab927db2541d881386333 100644 (file)
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -16,7 +16,6 @@ common_files = \
        udev.h \
        udev_rules.h \
        udev_sysdeps.h \
        udev.h \
        udev_rules.h \
        udev_sysdeps.h \

-       udev_db.c \

        udev_device_event.c \
        udev_node.c \
        udev_rules.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-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 \
        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 5290bc80185c99862f83d21d121ae41b09b6fe9b..040a48b0e3e6d1e13fdc664aab2bd65522165487 100644 (file)
--- 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);
 
 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);
 
 /* 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 896a466762ea89908982830a74cb0e8b2e888abe..e486df3656ebb6f270894416d1f9a709002fdba6 100644 (file)
--- 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);
 
 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;
 /* udev-util.c */
 struct name_entry {
        struct list_head node;