summaryrefslogtreecommitdiff
path: root/src/udev/udev-event.c
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-04-10 16:41:52 +0200
committerKay Sievers <kay@vrfy.org>2012-04-10 17:27:46 +0200
commit04a9d3a00a9290cbf254d0b0ba2ce4521be632ae (patch)
tree5b2e56bccb51717954cbd97c9a4da328a327db41 /src/udev/udev-event.c
parent235450b0d1b7269476b8a19bb20b016d2d3ffc46 (diff)
udev: fix gcc warnings showing up after adding $(AM_CFLAGS)
Diffstat (limited to 'src/udev/udev-event.c')
-rw-r--r--src/udev/udev-event.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index afbfebb3a9..debda61eed 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -86,8 +86,8 @@ size_t udev_event_apply_format(struct udev_event *event, const char *src, char *
SUBST_SYS,
};
static const struct subst_map {
- char *name;
- char fmt;
+ const char *name;
+ const char fmt;
enum subst_type type;
} map[] = {
{ .name = "devnode", .fmt = 'N', .type = SUBST_DEVNODE },
@@ -386,7 +386,6 @@ static int spawn_exec(struct udev_event *event,
const char *cmd, char *const argv[], char **envp, const sigset_t *sigmask,
int fd_stdout, int fd_stderr)
{
- struct udev *udev = event->udev;
int err;
int fd;
@@ -433,7 +432,6 @@ static void spawn_read(struct udev_event *event,
int fd_stdout, int fd_stderr,
char *result, size_t ressize)
{
- struct udev *udev = event->udev;
size_t respos = 0;
int fd_ep = -1;
struct epoll_event ep_outpipe, ep_errpipe;
@@ -553,7 +551,6 @@ out:
static int spawn_wait(struct udev_event *event, const char *cmd, pid_t pid)
{
- struct udev *udev = event->udev;
struct pollfd pfd[1];
int err = 0;
@@ -939,7 +936,6 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules,
udev_device_unref(event->dev_db);
event->dev_db = NULL;
}
-out:
return err;
}