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 8e9cf2d0eb5ef934272dd39e6418c95a6e939a7f..fc87cba4ab6cfc7f29dfb9343437db581559512b 100644 (file)
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -85,7 +83,7 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
 
        udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (udev_monitor->sock == -1) {
-               err(udev, "error getting socket: %s\n", strerror(errno));
+               err(udev, "error getting socket: %m\n");
                free(udev_monitor);
                return NULL;
        }
@@ -108,7 +106,7 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
 
        udev_monitor->sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
        if (udev_monitor->sock == -1) {
-               err(udev, "error getting socket: %s\n", strerror(errno));
+               err(udev, "error getting socket: %m\n");
                free(udev_monitor);
                return NULL;
        }
@@ -129,14 +127,14 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
        if (udev_monitor->snl.nl_family != 0) {
                err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->snl, sizeof(struct sockaddr_nl));
                if (err < 0) {
-                       err(udev_monitor->udev, "bind failed: %s\n", strerror(errno));
+                       err(udev_monitor->udev, "bind failed: %m\n");
                        return err;
                }
                info(udev_monitor->udev, "monitor %p listening on netlink\n", udev_monitor);
        } else if (udev_monitor->sun.sun_family != 0) {
                err = bind(udev_monitor->sock, (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
                if (err < 0) {
-                       err(udev_monitor->udev, "bind failed: %s\n", strerror(errno));
+                       err(udev_monitor->udev, "bind failed: %m\n");
                        return err;
                }
                /* enable receiving of the sender credentials */
@@ -286,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;
        }
@@ -302,43 +300,50 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
                bufpos += keylen + 1;
 
                if (strncmp(key, "DEVPATH=", 8) == 0) {
-                       device_set_devpath(udev_device, &key[8]);
+                       char path[UTIL_PATH_SIZE];
+
+                       util_strlcpy(path, udev_get_sys_path(udev_monitor->udev), sizeof(path));
+                       util_strlcat(path, &key[8], sizeof(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_devname(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));
                }
-               device_add_property_from_string(udev_device, key);
+               if (strncmp(key, "PHYSDEV", 7) == 0)
+                       continue;
+               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));
 
+       udev_device_set_info_loaded(udev_device);
        return udev_device;
 }