From: Kay Sievers <kay.sievers@suse.de>
Date: Wed, 6 Jul 2005 12:42:26 +0000 (+0200)
Subject: rename ALARM_TIMEOUT to UDEV_ALARM_TIMEOUT
X-Git-Tag: 061~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8815afa1df0dbb0b366156d4cebc56468906118c

rename ALARM_TIMEOUT to UDEV_ALARM_TIMEOUT

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
---

diff --git a/udev.c b/udev.c
index 7a0484472..d44f73081 100644
--- a/udev.c
+++ b/udev.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[], char *envp[])
 	sigaction(SIGTERM, &act, NULL);
 
 	/* trigger timeout to prevent hanging processes */
-	alarm(ALARM_TIMEOUT);
+	alarm(UDEV_ALARM_TIMEOUT);
 
 	action = getenv("ACTION");
 	devpath = getenv("DEVPATH");
diff --git a/udev.h b/udev.h
index b5287bb53..a8be0ed40 100644
--- a/udev.h
+++ b/udev.h
@@ -29,9 +29,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 
-#define ALARM_TIMEOUT			120
 #define COMMENT_CHARACTER		'#'
-
 #define LINE_SIZE			512
 #define NAME_SIZE			128
 #define PATH_SIZE			256
@@ -40,6 +38,7 @@
 #define VALUE_SIZE			128
 
 #define DEFAULT_PARTITIONS_COUNT	15
+#define UDEV_ALARM_TIMEOUT		120
 
 enum device_type {
 	DEV_UNKNOWN,
diff --git a/udevstart.c b/udevstart.c
index 4ef92fd53..d9912466c 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -359,7 +359,7 @@ int main(int argc, char *argv[], char *envp[])
 	sigaction(SIGTERM, &act, NULL);
 
 	/* trigger timeout to prevent hanging processes */
-	alarm(ALARM_TIMEOUT);
+	alarm(UDEV_ALARM_TIMEOUT);
 
 	udev_rules_init(&rules, 1);