libudev: also prefix non-exported functions with udev_*

[elogind.git] / udev / lib / libudev-monitor.c

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index e72b2066232885c6dc8addbda93b7b8b406bd7d2..fc87cba4ab6cfc7f29dfb9343437db581559512b 100644 (file)
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -284,7 +284,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
                return NULL;
        }
 
-       udev_device = device_init(udev_monitor->udev);
+       udev_device = device_new(udev_monitor->udev);
        if (udev_device == NULL) {
                return NULL;
        }
@@ -304,46 +304,46 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 
                        util_strlcpy(path, udev_get_sys_path(udev_monitor->udev), sizeof(path));
                        util_strlcat(path, &key[8], sizeof(path));
-                       device_set_syspath(udev_device, path);
+                       udev_device_set_syspath(udev_device, path);
                } else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
-                       device_set_subsystem(udev_device, &key[10]);
+                       udev_device_set_subsystem(udev_device, &key[10]);
                } else if (strncmp(key, "DEVNAME=", 8) == 0) {
-                       device_set_devnode(udev_device, &key[8]);
+                       udev_device_set_devnode(udev_device, &key[8]);
                } else if (strncmp(key, "DEVLINKS=", 9) == 0) {
                        char *slink = &key[9];
                        char *next = strchr(slink, ' ');
 
                        while (next != NULL) {
                                next[0] = '\0';
-                               device_add_devlink(udev_device, slink);
+                               udev_device_add_devlink(udev_device, slink);
                                slink = &next[1];
                                next = strchr(slink, ' ');
                        }
                        if (slink[0] != '\0')
-                               device_add_devlink(udev_device, slink);
+                               udev_device_add_devlink(udev_device, slink);
                } else if (strncmp(key, "DRIVER=", 7) == 0) {
-                       device_set_driver(udev_device, &key[7]);
+                       udev_device_set_driver(udev_device, &key[7]);
                } else if (strncmp(key, "ACTION=", 7) == 0) {
-                       device_set_action(udev_device, &key[7]);
+                       udev_device_set_action(udev_device, &key[7]);
                } else if (strncmp(key, "MAJOR=", 6) == 0) {
                        maj = strtoull(&key[6], NULL, 10);
                } else if (strncmp(key, "MINOR=", 6) == 0) {
                        min = strtoull(&key[6], NULL, 10);
                } else if (strncmp(key, "DEVPATH_OLD=", 12) == 0) {
-                       device_set_devpath_old(udev_device, &key[12]);
+                       udev_device_set_devpath_old(udev_device, &key[12]);
                } else if (strncmp(key, "PHYSDEVPATH=", 12) == 0) {
-                       device_set_physdevpath(udev_device, &key[12]);
+                       udev_device_set_physdevpath(udev_device, &key[12]);
                } else if (strncmp(key, "SEQNUM=", 7) == 0) {
-                       device_set_seqnum(udev_device, strtoull(&key[7], NULL, 10));
+                       udev_device_set_seqnum(udev_device, strtoull(&key[7], NULL, 10));
                } else if (strncmp(key, "TIMEOUT=", 8) == 0) {
-                       device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
+                       udev_device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
                }
                if (strncmp(key, "PHYSDEV", 7) == 0)
                        continue;
-               device_add_property_from_string(udev_device, key);
+               udev_device_add_property_from_string(udev_device, key);
        }
-       device_set_devnum(udev_device, makedev(maj, min));
+       udev_device_set_devnum(udev_device, makedev(maj, min));
 
-       device_set_info_loaded(udev_device);
+       udev_device_set_info_loaded(udev_device);
        return udev_device;
 }