man: document luks.options kernel commandline

[elogind.git] / src / udev / collect / collect.c

diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 6580a091e0a95890f0975b0131030a135e2d08cb..1346f27f91be55190f80ee6e5a0308eb47314082 100644 (file)
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -35,8 +35,8 @@
 #include "libudev-private.h"
 #include "macro.h"
 
-#define BUFSIZE                        16
-#define UDEV_ALARM_TIMEOUT        180
+#define BUFSIZE 16
+#define UDEV_ALARM_TIMEOUT 180
 
 enum collect_state {
         STATE_NONE,
@@ -140,10 +140,8 @@ static int checkout(int fd)
  restart:
         len = bufsize >> 1;
         buf = malloc(bufsize + 1);
-        if (!buf) {
-                fprintf(stderr, "Out of memory.\n");
+        if (!buf)
                 return log_oom();
-        }
         memset(buf, ' ', bufsize);
         buf[bufsize] = '\0';
 
@@ -444,19 +442,19 @@ int main(int argc, char **argv)
 
                         if (debug)
                                 fprintf(stderr, "ID %s: not in database\n", argv[i]);
-                        him = malloc(sizeof (struct _mate));
+                        him = new(struct _mate, 1);
                         if (!him) {
                                 ret = ENOMEM;
                                 goto out;
                         }
 
-                        him->name = malloc(strlen(argv[i]) + 1);
+                        him->name = strdup(argv[i]);
                         if (!him->name) {
+                                free(him);
                                 ret = ENOMEM;
                                 goto out;
                         }
 
-                        strcpy(him->name, argv[i]);
                         him->state = STATE_NONE;
                         udev_list_node_append(&him->node, &bunch);
                 } else {