X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevd.c;h=968b41667e356b2a81b6b8cff467506e83feb2e3;hp=258d7870ebf84f11cf89105296b21f2479fe928e;hb=29bbefe42883a660c6769f042e7bafdf151d720b;hpb=2738ec2cf721db0c0deac2ba0abdc73cf7739e9f

diff --git a/udev/udevd.c b/udev/udevd.c
index 258d7870e..968b41667 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -55,13 +55,12 @@ static void log_fn(struct udev *udev, int priority,
 {
 	if (debug) {
 		char buf[1024];
-		struct timeval tv;
-		struct timezone tz;
+		struct timespec ts;
 
 		vsnprintf(buf, sizeof(buf), format, args);
-		gettimeofday(&tv, &tz);
+		clock_gettime(CLOCK_MONOTONIC, &ts);
 		fprintf(stderr, "%llu.%06u [%u] %s: %s",
-			(unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+			(unsigned long long) ts.tv_sec, (unsigned int) ts.tv_nsec/1000,
 			(int) getpid(), fn, buf);
 	} else {
 		vsyslog(priority, format, args);
@@ -365,9 +364,6 @@ static void worker_new(struct event *event)
 						switch (fdsi.ssi_signo) {
 						case SIGTERM:
 							goto out;
-						case SIGALRM:
-							rc = EXIT_FAILURE;
-							goto out;
 						}
 					}
 				}