X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fscsi_id%2Fscsi_id.c;h=b1e089cb7c63ce3c276a19c75b81be391165988d;hp=0bb1bc495a5d969f956413302f7aebbe7eb7d3ff;hb=0d0f0c50d3a1d90f03972a6abb82e6413daaa583;hpb=e146e4516b9ea9907852e7ad609de39dca9e8769

diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index 0bb1bc495..b1e089cb7 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -198,8 +198,7 @@ static int get_file_options(struct udev *udev,
         buffer = malloc(MAX_BUFFER_LEN);
         if (!buffer) {
                 fclose(fd);
-                log_error("Out of memory.");
-                return -1;
+                return log_oom();
         }
 
         *newargv = NULL;
@@ -231,7 +230,7 @@ static int get_file_options(struct udev *udev,
                 if (str1 && strcasecmp(str1, "VENDOR") == 0) {
                         str1 = get_value(&buf);
                         if (!str1) {
-                                retval = -1;
+                                retval = log_oom();
                                 break;
                         }
                         vendor_in = str1;
@@ -240,7 +239,7 @@ static int get_file_options(struct udev *udev,
                         if (str1 && strcasecmp(str1, "MODEL") == 0) {
                                 str1 = get_value(&buf);
                                 if (!str1) {
-                                        retval = -1;
+                                        retval = log_oom();
                                         break;
                                 }
                                 model_in = str1;
@@ -251,7 +250,7 @@ static int get_file_options(struct udev *udev,
                 if (str1 && strcasecmp(str1, "OPTIONS") == 0) {
                         str1 = get_value(&buf);
                         if (!str1) {
-                                retval = -1;
+                                retval = log_oom();
                                 break;
                         }
                         options_in = str1;
@@ -294,8 +293,7 @@ static int get_file_options(struct udev *udev,
                         c = argc_count(buffer) + 2;
                         *newargv = calloc(c, sizeof(**newargv));
                         if (!*newargv) {
-                                log_error("Out of memory.");
-                                retval = -1;
+                                retval = log_oom();
                         } else {
                                 *argc = c;
                                 c = 0;