chiark / gitweb /
rename ALARM_TIMEOUT to UDEV_ALARM_TIMEOUT
authorKay Sievers <kay.sievers@suse.de>
Wed, 6 Jul 2005 12:42:26 +0000 (14:42 +0200)
committerKay Sievers <kay.sievers@suse.de>
Wed, 6 Jul 2005 12:42:26 +0000 (14:42 +0200)
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
udev.c
udev.h
udevstart.c

diff --git a/udev.c b/udev.c
index 7a04844..d44f730 100644 (file)
--- 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 b5287bb..a8be0ed 100644 (file)
--- 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,
index 4ef92fd..d991246 100644 (file)
@@ -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);