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.

1 files changed, 0 insertions, 80 deletions

diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
deleted file mode 100644
index 1de0b94fd..000000000
--- a/src/shared/sysctl-util.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  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/>.
-***/
-
-#include <stdlib.h>
-#include <stdbool.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <limits.h>
-#include <getopt.h>
-
-#include "log.h"
-#include "util.h"
-#include "fileio.h"
-#include "build.h"
-#include "sysctl-util.h"
-
-char *sysctl_normalize(char *s) {
-        char *n;
-
-        n = strpbrk(s, "/.");
-        /* If the first separator is a slash, the path is
-         * assumed to be normalized and slashes remain slashes
-         * and dots remains dots. */
-        if (!n || *n == '/')
-                return s;
-
-        /* Otherwise, dots become slashes and slashes become
-         * dots. Fun. */
-        while (n) {
-                if (*n == '.')
-                        *n = '/';
-                else
-                        *n = '.';
-
-                n = strpbrk(n + 1, "/.");
-        }
-
-        return s;
-}
-
-int sysctl_write(const char *property, const char *value) {
-        char *p;
-
-        assert(property);
-        assert(value);
-
-        log_debug("Setting '%s' to '%s'", property, value);
-
-        p = strjoina("/proc/sys/", property);
-        return write_string_file(p, value, 0);
-}
-
-int sysctl_read(const char *property, char **content) {
-        char *p;
-
-        assert(property);
-        assert(content);
-
-        p = strjoina("/proc/sys/", property);
-        return read_full_file(p, content, NULL);
-}