|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
From 124f09e8125e1eae5b058b1f287e72c85a46d557 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
From: Dave Reisner <dreisner@archlinux.org>
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
Date: Sat, 13 Sep 2014 14:10:33 -0400
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
Subject: [PATCH] networkd: remove vestigial event sources
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
187fe1db took advantage of floating events, but didn't remove pointers
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
it made superfluous.
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
src/network/networkd-manager.c | 2 --
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
src/network/networkd.h | 2 --
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
2 files changed, 4 deletions(-)
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
index 5a4f93a06b..1614bc0091 100644
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
--- a/src/network/networkd-manager.c
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+++ b/src/network/networkd-manager.c
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
@@ -146,8 +146,6 @@ void manager_free(Manager *m) {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
udev_unref(m->udev);
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
sd_bus_unref(m->bus);
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
sd_event_source_unref(m->udev_event_source);
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- sd_event_source_unref(m->sigterm_event_source);
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- sd_event_source_unref(m->sigint_event_source);
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
sd_event_unref(m->event);
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
while ((link = hashmap_first(m->links)))
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
diff --git a/src/network/networkd.h b/src/network/networkd.h
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
index 7c5459b6ac..d4e79ab2f3 100644
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
--- a/src/network/networkd.h
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
+++ b/src/network/networkd.h
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
@@ -174,8 +174,6 @@ struct Manager {
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
struct udev *udev;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
struct udev_monitor *udev_monitor;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
sd_event_source *udev_event_source;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- sd_event_source *sigterm_event_source;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
- sd_event_source *sigint_event_source;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
char *state_file;
|
|
Zbigniew Jędrzejewski-Szmek |
62fe94 |
|