fsck: use log_device_*()

yuwata · yuwata · commit 7bd33dbd6ee6 · 2018-10-23T22:44:07.000+09:00
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
@@ -347,7 +347,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_device_get_devname(dev, &device);
                 if (r < 0) {
-                        log_error_errno(r, "Failed to detect device node of root directory: %m");
+                        log_device_error_errno(dev, r, "Failed to detect device node of root directory: %m");
                         goto finish;
                 }
 
@@ -357,9 +357,9 @@ int main(int argc, char *argv[]) {
         if (sd_device_get_property_value(dev, "ID_FS_TYPE", &type) >= 0) {
                 r = fsck_exists(type);
                 if (r < 0)
-                        log_warning_errno(r, "Couldn't detect if fsck.%s may be used for %s, proceeding: %m", type, device);
+                        log_device_warning_errno(dev, r, "Couldn't detect if fsck.%s may be used, proceeding: %m", type);
                 else if (r == 0) {
-                        log_info("fsck.%s doesn't exist, not checking file system on %s.", type, device);
+                        log_device_info(dev, "fsck.%s doesn't exist, not checking file system.", type);
                         goto finish;
                 }
         }

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ int main(int argc, char *argv[]) {`
`347`	`347`
`348`	`348`	`r = sd_device_get_devname(dev, &device);`
`349`	`349`	`if (r < 0) {`
`350`		`- log_error_errno(r, "Failed to detect device node of root directory: %m");`
	`350`	`+ log_device_error_errno(dev, r, "Failed to detect device node of root directory: %m");`
`351`	`351`	`goto finish;`
`352`	`352`	`}`
`353`	`353`
`@@ -357,9 +357,9 @@ int main(int argc, char *argv[]) {`
`357`	`357`	`if (sd_device_get_property_value(dev, "ID_FS_TYPE", &type) >= 0) {`
`358`	`358`	`r = fsck_exists(type);`
`359`	`359`	`if (r < 0)`
`360`		`- log_warning_errno(r, "Couldn't detect if fsck.%s may be used for %s, proceeding: %m", type, device);`
	`360`	`+ log_device_warning_errno(dev, r, "Couldn't detect if fsck.%s may be used, proceeding: %m", type);`
`361`	`361`	`else if (r == 0) {`
`362`		`- log_info("fsck.%s doesn't exist, not checking file system on %s.", type, device);`
	`362`	`+ log_device_info(dev, "fsck.%s doesn't exist, not checking file system.", type);`
`363`	`363`	`goto finish;`
`364`	`364`	`}`
`365`	`365`	`}`