From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sun, 29 Mar 2009 18:08:52 +0000 (+0200)
Subject: "UDEV_MONITOR_KERNEL/UDEV" -> "kernel/udev"
X-Git-Tag: 174~1106
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f2b937440c682bca3837263a1bafd78e30b17e4d;p=elogind.git

"UDEV_MONITOR_KERNEL/UDEV" -> "kernel/udev"
---

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index b2f76c312..d006596e0 100644
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -34,6 +34,11 @@ struct udev_monitor {
 	socklen_t addrlen;
 };
 
+enum udev_monitor_netlink_group {
+	UDEV_MONITOR_KERNEL	= 1,
+	UDEV_MONITOR_UDEV	= 2,
+};
+
 /**
  * udev_monitor_new_from_socket:
  * @udev: udev library context
@@ -91,12 +96,23 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
 	return udev_monitor;
 }
 
-struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, unsigned int group)
+struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, const char *name)
 {
 	struct udev_monitor *udev_monitor;
+	unsigned int group;
 
 	if (udev == NULL)
 		return NULL;
+
+	if (name == NULL)
+		return NULL;
+	if (strcmp(name, "kernel") == 0)
+		group = UDEV_MONITOR_KERNEL;
+	else if (strcmp(name, "udev") == 0)
+		group = UDEV_MONITOR_UDEV;
+	else
+		return NULL;
+
 	udev_monitor = calloc(1, sizeof(struct udev_monitor));
 	if (udev_monitor == NULL)
 		return NULL;
diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h
index be09ddb75..e0aa571e2 100644
--- a/udev/lib/libudev.h
+++ b/udev/lib/libudev.h
@@ -76,12 +76,8 @@ extern const char *udev_device_get_sysattr_value(struct udev_device *udev_device
 
 /* udev and kernel device events */
 struct udev_monitor;
-enum udev_monitor_netlink_group {
-	UDEV_MONITOR_KERNEL	= 1,
-	UDEV_MONITOR_UDEV	= 2,
-};
 extern struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
-extern struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, enum udev_monitor_netlink_group group);
+extern struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, const char *name);
 extern int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor);
 extern struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor);
 extern void udev_monitor_unref(struct udev_monitor *udev_monitor);
diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 43c1cc116..d8ec06646 100644
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -125,7 +125,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 
 	printf("monitor will print the received events for:\n");
 	if (print_udev) {
-		udev_monitor = udev_monitor_new_from_netlink(udev, UDEV_MONITOR_UDEV);
+		udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
 		if (udev_monitor == NULL) {
 			rc = 1;
 			goto out;
@@ -137,7 +137,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 		printf("UDEV - the event which udev sends out after rule processing\n");
 	}
 	if (print_kernel) {
-		kernel_monitor = udev_monitor_new_from_netlink(udev, UDEV_MONITOR_KERNEL);
+		kernel_monitor = udev_monitor_new_from_netlink(udev, "kernel");
 		if (kernel_monitor == NULL) {
 			fprintf(stderr, "unable to subscribe to kernel events\n");
 			rc = 3;
@@ -147,7 +147,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 			rc = 4;
 			goto out;
 		}
-		printf("UEVENT - the kernel uevent\n");
+		printf("KERNEL - the kernel uevent\n");
 	}
 	printf("\n");
 
@@ -174,7 +174,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 			device = udev_monitor_receive_device(kernel_monitor);
 			if (device == NULL)
 				continue;
-			print_device(device, "UEVENT", env);
+			print_device(device, "KERNEL", env);
 			udev_device_unref(device);
 		}
 
diff --git a/udev/udevd.c b/udev/udevd.c
index d9de26ea6..6de119642 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -813,7 +813,7 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	kernel_monitor = udev_monitor_new_from_netlink(udev, UDEV_MONITOR_KERNEL);
+	kernel_monitor = udev_monitor_new_from_netlink(udev, "kernel");
 	if (kernel_monitor == NULL || udev_monitor_enable_receiving(kernel_monitor) < 0) {
 		fprintf(stderr, "error initializing netlink socket\n");
 		err(udev, "error initializing netlink socket\n");