chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: remove unnecessary global variable
[elogind.git]
/
udevsettle.c
diff --git
a/udevsettle.c
b/udevsettle.c
index e3982a42b0d69bf4f160acf2e49976d47eccd77a..4b66f89cd64034a004a46c7626428a291b8ece34 100644
(file)
--- a/
udevsettle.c
+++ b/
udevsettle.c
@@
-57,7
+57,7
@@
int udevsettle(int argc, char *argv[], char *envp[])
logging_init("udevsettle");
udev_config_init();
logging_init("udevsettle");
udev_config_init();
- dbg("version %s", UDEV_VERSION);
+ dbg("version %s
\n
", UDEV_VERSION);
sysfs_init();
while (1) {
sysfs_init();
while (1) {
@@
-72,7
+72,7
@@
int udevsettle(int argc, char *argv[], char *envp[])
timeout = seconds;
else
fprintf(stderr, "invalid timeout value\n");
timeout = seconds;
else
fprintf(stderr, "invalid timeout value\n");
- dbg("timeout=%i", timeout);
+ dbg("timeout=%i
\n
", timeout);
break;
case 'h':
printf("Usage: udevadm settle [--help] [--timeout=<seconds>]\n\n");
break;
case 'h':
printf("Usage: udevadm settle [--help] [--timeout=<seconds>]\n\n");
@@
-90,13
+90,13
@@
int udevsettle(int argc, char *argv[], char *envp[])
struct stat statbuf;
if (stat(queuename, &statbuf) < 0) {
struct stat statbuf;
if (stat(queuename, &statbuf) < 0) {
- info("queue is empty");
+ info("queue is empty
\n
");
break;
}
usleep(1000 * 1000 / LOOP_PER_SECOND);
}
if (loop <= 0) {
break;
}
usleep(1000 * 1000 / LOOP_PER_SECOND);
}
if (loop <= 0) {
- info("timeout waiting for queue");
+ info("timeout waiting for queue
\n
");
goto exit;
}
goto exit;
}
@@
-112,7
+112,7
@@
int udevsettle(int argc, char *argv[], char *envp[])
goto exit;
seqnum[len] = '\0';
seq_udev = strtoull(seqnum, NULL, 10);
goto exit;
seqnum[len] = '\0';
seq_udev = strtoull(seqnum, NULL, 10);
- info("udev seqnum = %llu", seq_udev);
+ info("udev seqnum = %llu
\n
", seq_udev);
/* read current kernel seqnum */
strlcpy(filename, sysfs_path, sizeof(filename));
/* read current kernel seqnum */
strlcpy(filename, sysfs_path, sizeof(filename));
@@
-126,16
+126,16
@@
int udevsettle(int argc, char *argv[], char *envp[])
goto exit;
seqnum[len] = '\0';
seq_kernel = strtoull(seqnum, NULL, 10);
goto exit;
seqnum[len] = '\0';
seq_kernel = strtoull(seqnum, NULL, 10);
- info("kernel seqnum = %llu", seq_kernel);
+ info("kernel seqnum = %llu
\n
", seq_kernel);
/* make sure all kernel events have arrived in the queue */
if (seq_udev >= seq_kernel) {
/* make sure all kernel events have arrived in the queue */
if (seq_udev >= seq_kernel) {
- info("queue is empty and no pending events left");
+ info("queue is empty and no pending events left
\n
");
rc = 0;
goto exit;
}
usleep(1000 * 1000 / LOOP_PER_SECOND);
rc = 0;
goto exit;
}
usleep(1000 * 1000 / LOOP_PER_SECOND);
- info("queue is empty, but events still pending");
+ info("queue is empty, but events still pending
\n
");
}
exit:
}
exit: