Remove src/tty-ask-password-agent

[elogind.git] / src / udev / scsi_id / scsi_serial.c

diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index b3d20a3c2db3d931a77b32436efe76ae7d1a72a1..dcfff1d4ea07594630c5508f810312de03d80f65 100644 (file)
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -361,7 +361,7 @@ resend:
                         dev_scsi->use_sg = 3;
                         goto resend;
                 }
                         dev_scsi->use_sg = 3;
                         goto resend;
                 }

-                log_debug("%s: ioctl failed: %m", dev_scsi->kernel);
+                log_debug_errno(errno, "%s: ioctl failed: %m", dev_scsi->kernel);

                 goto error;
         }
 
                 goto error;
         }
 


@@ -819,12 +819,12 @@ int scsi_std_inquiry(struct udev *udev,
 
         fd = open(devname, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
         if (fd < 0) {
 
         fd = open(devname, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
         if (fd < 0) {

-                log_debug("scsi_id: cannot open %s: %m", devname);
+                log_debug_errno(errno, "scsi_id: cannot open %s: %m", devname);

                 return 1;
         }
 
         if (fstat(fd, &statbuf) < 0) {
                 return 1;
         }
 
         if (fstat(fd, &statbuf) < 0) {

-                log_debug("scsi_id: cannot stat %s: %m", devname);
+                log_debug_errno(errno, "scsi_id: cannot stat %s: %m", devname);

                 err = 2;
                 goto out;
         }
                 err = 2;
                 goto out;
         }


@@ -861,7 +861,7 @@ int scsi_get_serial(struct udev *udev,
         int retval;
 
         memzero(dev_scsi->serial, len);
         int retval;
 
         memzero(dev_scsi->serial, len);

-        srand((unsigned int)getpid());
+        initialize_srand();

         for (cnt = 20; cnt > 0; cnt--) {
                 struct timespec duration;
 
         for (cnt = 20; cnt > 0; cnt--) {
                 struct timespec duration;