_noreturn_ --> noreturn for C11 compat

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

diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
index 4d30fd899468d3198ebcb31eb661f8594d835416..28e9acb296bf2b628d759a0a5835f9e9d7ebb611 100644 (file)
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -334,11 +334,10 @@ static int disk_identify(struct udev *udev,
         int peripheral_device_type;
         int all_nul_bytes;
         int n;
         int peripheral_device_type;
         int all_nul_bytes;
         int n;

-        int is_packet_device;
+        int is_packet_device = 0;

 
         /* init results */
 
         /* init results */

-        zero(out_identify);
-        is_packet_device = 0;
+        memzero(out_identify, 512);

 
         /* If we were to use ATA PASS_THROUGH (12) on an ATAPI device
          * we could accidentally blank media. This is because MMC's BLANK
 
         /* If we were to use ATA PASS_THROUGH (12) on an ATAPI device
          * we could accidentally blank media. This is because MMC's BLANK


@@ -402,10 +401,11 @@ static int disk_identify(struct udev *udev,
 
 out:
         if (out_is_packet_device != NULL)
 
 out:
         if (out_is_packet_device != NULL)

-          *out_is_packet_device = is_packet_device;
+                *out_is_packet_device = is_packet_device;

         return ret;
 }
 
         return ret;
 }
 

+_printf_(6,0)

 static void log_fn(struct udev *udev, int priority,
                    const char *file, int line, const char *fn,
                    const char *format, va_list args)
 static void log_fn(struct udev *udev, int priority,
                    const char *file, int line, const char *fn,
                    const char *format, va_list args)


@@ -502,7 +502,7 @@ int main(int argc, char *argv[])
         } else {
                 /* If this fails, then try HDIO_GET_IDENTITY */
                 if (ioctl(fd, HDIO_GET_IDENTITY, &id) != 0) {
         } else {
                 /* If this fails, then try HDIO_GET_IDENTITY */
                 if (ioctl(fd, HDIO_GET_IDENTITY, &id) != 0) {

-                        log_info("HDIO_GET_IDENTITY failed for '%s': %m\n", node);
+                        log_debug("HDIO_GET_IDENTITY failed for '%s': %m\n", node);

                         rc = 2;
                         goto close;
                 }
                         rc = 2;
                         goto close;
                 }