summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rwxr-xr-xextras/eventrecorder.sh2
-rw-r--r--logging.h4
-rw-r--r--udev.xml2
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 460ccf9ee7..1234160d63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# Makefile for udev
#
# Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ USE_STATIC = false
# make EXTRAS="extras/<extra1> extras/<extra2>"
EXTRAS =
-# make the build silent.
+# make the build silent
V =
PROGRAMS = \
@@ -213,8 +213,8 @@ udev_version.h:
$(Q) echo "/* Generated by make. */" > $@
$(Q) echo \#define UDEV_VERSION \"$(VERSION)\" >> $@
$(Q) echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
- $(Q) echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
- $(Q) echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
+ $(Q) echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
+ $(Q) echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
# man pages
%.8 %.7: %.xml
diff --git a/extras/eventrecorder.sh b/extras/eventrecorder.sh
index 95ec95a24e..d3e4a70c95 100755
--- a/extras/eventrecorder.sh
+++ b/extras/eventrecorder.sh
@@ -1,4 +1,4 @@
#!/bin/sh
[ -d /events ] || exit 0
-set > /events/debug.$SEQNUM.$1.$ACTION.$$
+set > /events/debug.$SEQNUM.$SUBSYSTEM.$ACTION.$$
diff --git a/logging.h b/logging.h
index dd520dd874..00b5f23b25 100644
--- a/logging.h
+++ b/logging.h
@@ -38,13 +38,13 @@
#undef err
#define err(format, arg...) \
do { \
- log_message(LOG_ERR ,"%s: " format ,__FUNCTION__ ,## arg); \
+ log_message(LOG_ERR ,"%s: " format ,__FUNCTION__ ,## arg); \
} while (0)
#undef info
#define info(format, arg...) \
do { \
- log_message(LOG_INFO ,"%s: " format ,__FUNCTION__ ,## arg); \
+ log_message(LOG_INFO ,"%s: " format ,__FUNCTION__ ,## arg); \
} while (0)
#ifdef DEBUG
diff --git a/udev.xml b/udev.xml
index e0542a6be1..bf5676bee6 100644
--- a/udev.xml
+++ b/udev.xml
@@ -11,7 +11,7 @@
<email>kay.sievers@vrfy.org</email>
</author>
<copyright>
- <year>2005</year>
+ <year>2006</year>
<holder>Kay Sievers</holder>
</copyright>
</articleinfo>