diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 11:30:17 +0100 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 12:12:32 +0100 |
commit | 3d1092eab0f4a5c771225c78072a7b6eccb82849 (patch) | |
tree | 2b1603e5a0aa1e7e42f4bb9bbcac73bfac46e63d /src/libelogind/sd-hwdb | |
parent | d76bb3c179b7a32b109e39aa87ff09c8f5a8c178 (diff) |
Major cleanup of all leftovers after rebasing on master.
The patching of elogind in several steps with only partly rebasing on
a common commit with upstream, left the tree in a state, that was
unmergeable with master. By rebasing on master and manually cleaning
up all commits, this merge is now possible.
However, this process left some orphans, that are cleanup now.
Diffstat (limited to 'src/libelogind/sd-hwdb')
-rw-r--r-- | src/libelogind/sd-hwdb/hwdb-util.h | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/src/libelogind/sd-hwdb/hwdb-util.h b/src/libelogind/sd-hwdb/hwdb-util.h deleted file mode 100644 index 627c46be1..000000000 --- a/src/libelogind/sd-hwdb/hwdb-util.h +++ /dev/null @@ -1,56 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -/*** - This file is part of systemd. - - Copyright 2014 Tom Gundersen <teg@jklm.no> - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see <http://www.gnu.org/licenses/>. -***/ - -#pragma once - -#include "sd-event.h" -#include "sd-netlink.h" -#include "sd-network.h" - -#include "hashmap.h" - -typedef struct Manager Manager; - -#include "networkd-wait-online-link.h" - -struct Manager { - Hashmap *links; - Hashmap *links_by_name; - - char **interfaces; - char **ignore; - - sd_netlink *rtnl; - sd_event_source *rtnl_event_source; - - sd_network_monitor *network_monitor; - sd_event_source *network_monitor_event_source; - - sd_event *event; -}; - -void manager_free(Manager *m); -int manager_new(Manager **ret, char **interfaces, char **ignore, usec_t timeout); - -DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); - -bool manager_all_configured(Manager *m); -bool manager_ignore_link(Manager *m, Link *link); |