summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2005-07-06 14:42:26 +0200
committerKay Sievers <kay.sievers@suse.de>2005-07-06 14:42:26 +0200
commit8815afa1df0dbb0b366156d4cebc56468906118c (patch)
treefa6f012cc6abf6f4013687b5db42b950d3e0b657
parentebfc1acd48606d9f2967d92f265010edf010634b (diff)
rename ALARM_TIMEOUT to UDEV_ALARM_TIMEOUT
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
-rw-r--r--udev.c2
-rw-r--r--udev.h3
-rw-r--r--udevstart.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/udev.c b/udev.c
index 7a0484472a..d44f73081d 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 b5287bb53f..a8be0ed400 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 4ef92fd537..d9912466ca 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);