From: Greg KH <greg@press.(none)>
Date: Wed, 27 Apr 2005 05:52:57 +0000 (-0700)
Subject: fixups to get back to proper patch order
X-Git-Tag: 047~29
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1e95455d2683f43f47ea94a7b79af64f0738d36;p=systemd

fixups to get back to proper patch order

Damm, it's hard to merge a multi-line tree into one flat line at times...
---

diff --git a/test/udev-test.pl b/test/udev-test.pl
index c2d8e27a..d5845795 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -35,9 +35,6 @@ my $perm      = "udev.permissions";
 my $main_conf = "udev-test.conf";
 my $conf_tmp  = "udev-test.rules";
 
-# uncomment following line to run udev with valgrind.
-# Should make this a runtime option to the script someday...
-#my $udev_bin  = "valgrind --tool=memcheck --leak-check=yes   ../udev";
 
 my @tests = (
 	{
@@ -1262,6 +1259,7 @@ sub run_test {
 
 
 	udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf});
+
 	if ((-e "$PWD/$udev_root$config->{exp_name}") ||
 	    (-l "$PWD/$udev_root$config->{exp_name}")) {
 
diff --git a/udev.c b/udev.c
index 5ad7e425..35fa533a 100644
--- a/udev.c
+++ b/udev.c
@@ -108,7 +108,6 @@ int main(int argc, char *argv[], char *envp[])
 	udev_init_config();
 
 	/* set signal handlers */
-	memset(&act, 0x00, sizeof(act));
 	act.sa_handler = (void (*) (int))sig_handler;
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = 0;
@@ -193,10 +192,6 @@ int main(int argc, char *argv[], char *envp[])
 			/* get node from db, remove db-entry, delete created node */
 			retval = udev_remove_device(&udev);
 
-			/* Set the DEVNAME if known */
-			if (udev.devname[0] != '\0') {
-				setenv("DEVNAME", udev.devname, 1);
-			}
 			/* run dev.d/ scripts if we're not instructed to ignore the event */
 			if (udev_dev_d && udev.devname[0] != '\0') {
 				setenv("DEVNAME", udev.devname, 1);
diff --git a/udevinfo.c b/udevinfo.c
index 6e6b9aeb..fe847b87 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -401,7 +401,7 @@ print:
 			break;
 
 		case PATH:
-			strfieldcpy(result, udev.devpath);
+			strfieldcpy(result, path);
 			break;
 
 		case ALL: