From 8e9e2736dd0bb590cd9db300d12838d40cfe619e Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Sun, 21 Apr 2013 11:47:20 -0700
Subject: discover: Rename struct udev to struct pb_udev

To avoid symbol clashes with libudev, rename struct udev to
struct pb_udev.  No functional changes.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 discover/pb-discover.c |  2 +-
 discover/udev.c        | 18 +++++++++---------
 discover/udev.h        |  9 +++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index ffe4a12..7199b1b 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
 	struct discover_server *server;
 	struct waitset *waitset;
 	struct opts opts;
-	struct udev *udev;
+	struct pb_udev *udev;
 	struct user_event *uev;
 
 	if (opts_parse(&opts, argc, argv)) {
diff --git a/discover/udev.c b/discover/udev.c
index 40b9f63..bb9331b 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -24,7 +24,7 @@
 
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
-struct udev {
+struct pb_udev {
 	struct device_handler *handler;
 	int socket;
 };
@@ -52,7 +52,7 @@ static void udev_print_event(struct event *event)
 				params[i], event_get_param(event, params[i]));
 }
 
-static void udev_handle_message(struct udev *udev, char *buf, int len)
+static void udev_handle_message(struct pb_udev *udev, char *buf, int len)
 {
 	int result;
 	struct event *event;
@@ -87,7 +87,7 @@ static void udev_handle_message(struct udev *udev, char *buf, int len)
 
 static int udev_process(void *arg)
 {
-	struct udev *udev = arg;
+	struct pb_udev *udev = arg;
 	char buf[4096];
 	int len;
 
@@ -108,7 +108,7 @@ static int udev_process(void *arg)
 
 static int udev_destructor(void *p)
 {
-	struct udev *udev = p;
+	struct pb_udev *udev = p;
 
 	if (udev->socket >= 0)
 		close(udev->socket);
@@ -116,14 +116,14 @@ static int udev_destructor(void *p)
 	return 0;
 }
 
-struct udev *udev_init(struct waitset *waitset, struct device_handler *handler)
+struct pb_udev *udev_init(struct waitset *waitset, struct device_handler *handler)
 {
 	struct sockaddr_un addr;
-	struct udev *udev;
+	struct pb_udev *udev;
 
 	unlink(PBOOT_DEVICE_SOCKET);
 
-	udev = talloc(NULL, struct udev);
+	udev = talloc(NULL, struct pb_udev);
 
 	udev->handler = handler;
 
@@ -155,7 +155,7 @@ out_err:
 	return NULL;
 }
 
-int udev_trigger(struct udev __attribute__((unused)) *udev)
+int udev_trigger(struct pb_udev __attribute__((unused)) *udev)
 {
 	const char *cmd[] = {
 		pb_system_apps.udevadm,
@@ -174,7 +174,7 @@ int udev_trigger(struct udev __attribute__((unused)) *udev)
 	return WEXITSTATUS(rc);
 }
 
-void udev_destroy(struct udev *udev)
+void udev_destroy(struct pb_udev *udev)
 {
 	talloc_free(udev);
 }
diff --git a/discover/udev.h b/discover/udev.h
index 590eed1..2ea9090 100644
--- a/discover/udev.h
+++ b/discover/udev.h
@@ -1,12 +1,13 @@
 #ifndef _UDEV_H
 #define _UDEV_H
 
-struct udev;
+struct pb_udev;
 struct device_handler;
 struct waitset;
 
-struct udev *udev_init(struct waitset *waitset, struct device_handler *handler);
-int udev_trigger(struct udev *udev);
-void udev_destroy(struct udev *udev);
+struct pb_udev *udev_init(struct waitset *waitset,
+	struct device_handler *handler);
+int udev_trigger(struct pb_udev *udev);
+void udev_destroy(struct pb_udev *udev);
 
 #endif /* _UDEV_H */
-- 
cgit v1.2.1