To avoid symbol clashes with libudev, rename struct udev to
struct pb_udev. No functional changes.
Signed-off-by: Geoff Levand <geoff@infradead.org>
struct discover_server *server;
struct waitset *waitset;
struct opts opts;
struct discover_server *server;
struct waitset *waitset;
struct opts opts;
struct user_event *uev;
if (opts_parse(&opts, argc, argv)) {
struct user_event *uev;
if (opts_parse(&opts, argc, argv)) {
#define max(a, b) ((a) > (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))
struct device_handler *handler;
int socket;
};
struct device_handler *handler;
int socket;
};
params[i], event_get_param(event, params[i]));
}
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;
{
int result;
struct event *event;
static int udev_process(void *arg)
{
static int udev_process(void *arg)
{
- struct udev *udev = arg;
+ struct pb_udev *udev = arg;
static int udev_destructor(void *p)
{
static int udev_destructor(void *p)
{
+ struct pb_udev *udev = p;
if (udev->socket >= 0)
close(udev->socket);
if (udev->socket >= 0)
close(udev->socket);
-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 sockaddr_un addr;
unlink(PBOOT_DEVICE_SOCKET);
unlink(PBOOT_DEVICE_SOCKET);
- udev = talloc(NULL, struct udev);
+ udev = talloc(NULL, struct pb_udev);
-int udev_trigger(struct udev __attribute__((unused)) *udev)
+int udev_trigger(struct pb_udev __attribute__((unused)) *udev)
{
const char *cmd[] = {
pb_system_apps.udevadm,
{
const char *cmd[] = {
pb_system_apps.udevadm,
return WEXITSTATUS(rc);
}
return WEXITSTATUS(rc);
}
-void udev_destroy(struct udev *udev)
+void udev_destroy(struct pb_udev *udev)
#ifndef _UDEV_H
#define _UDEV_H
#ifndef _UDEV_H
#define _UDEV_H
struct device_handler;
struct waitset;
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);