kerneldoc comment fixes

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

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index d0f28849aa11bf126b1600e1e0744b06a893d66e..fc5b176be09f28745472e0c9aa9ffb05be114ce7 100644 (file)
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -54,7 +54,7 @@ struct udev_monitor {
  * socket will be used.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev monitor.
+ * release the resources of the udev monitor.
  *
  * Returns: a new udev monitor, or #NULL, in case of an error
  **/
@@ -67,10 +67,9 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
                return NULL;
        if (socket_path == NULL)
                return NULL;
-       udev_monitor = malloc(sizeof(struct udev_monitor));
+       udev_monitor = calloc(1, sizeof(struct udev_monitor));
        if (udev_monitor == NULL)
                return NULL;
-       memset(udev_monitor, 0x00, sizeof(struct udev_monitor));
        udev_monitor->refcount = 1;
        udev_monitor->udev = udev;
 
@@ -105,10 +104,9 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
 
        if (udev == NULL)
                return NULL;
-       udev_monitor = malloc(sizeof(struct udev_monitor));
+       udev_monitor = calloc(1, sizeof(struct udev_monitor));
        if (udev_monitor == NULL)
                return NULL;
-       memset(udev_monitor, 0x00, sizeof(struct udev_monitor));
        udev_monitor->refcount = 1;
        udev_monitor->udev = udev;
 
@@ -152,6 +150,13 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
        return 0;
 }
 
+int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_monitor, int size)
+{
+       if (udev_monitor == NULL)
+               return -1;
+       return setsockopt(udev_monitor->sock, SOL_SOCKET, SO_RCVBUFFORCE, &size, sizeof(size));
+}
+
 /**
  * udev_monitor_ref:
  * @udev_monitor: udev monitor
@@ -173,7 +178,7 @@ struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor)
  * @udev_monitor: udev monitor
  *
  * Drop a reference ofa udev monitor. If the refcount reaches zero,
- * the bound socket will be closed, and the ressources of the monitor
+ * the bound socket will be closed, and the resources of the monitor
  * will be released.
  *
  **/
@@ -228,11 +233,11 @@ int udev_monitor_get_fd(struct udev_monitor *udev_monitor)
  * device, fill in the received data, and return the device.
  *
  * Only socket connections with uid=0 are accepted. The caller
- * needs to make sure, that there is data to read from the socket,
- * the call will block until the socket becomes readable.
+ * needs to make sure that there is data to read from the socket.
+ * The call will block until the socket becomes readable.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev device.
+ * release the resources of the udev device.
  *
  * Returns: a new udev device, or #NULL, in case of an error
  **/
@@ -375,25 +380,15 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 
 int udev_monitor_send_device(struct udev_monitor *udev_monitor, struct udev_device *udev_device)
 {
-       const char *action;
-       struct udev_list_entry *list_entry;
-       char buf[4096];
-       size_t bufpos;
+       const char *buf;
+       ssize_t len;
        ssize_t count;
 
-       action = udev_device_get_action(udev_device);
-       if (action == NULL)
-               return -EINVAL;
-       bufpos = snprintf(buf, sizeof(buf), "%s@%s", action, udev_device_get_devpath(udev_device));
-       bufpos++;
-       udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
-               bufpos += snprintf(&buf[bufpos], sizeof(buf) - bufpos, "%s=%s",
-                                  udev_list_entry_get_name(list_entry),
-                                  udev_list_entry_get_value(list_entry));
-               bufpos++;
-       }
+       len = udev_device_get_properties_monitor_buf(udev_device, &buf);
+       if (len < 32)
+               return -1;
        count = sendto(udev_monitor->sock,
-                      &buf, bufpos, 0,
+                      buf, len, 0,
                       (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
        info(udev_monitor->udev, "passed %zi bytes to monitor %p, \n", count, udev_monitor);
        return count;