summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cb/elogind.cbp1
-rw-r--r--src/shared/output-mode.h48
-rw-r--r--src/test/test-signal-util.c49
3 files changed, 0 insertions, 98 deletions
diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index 833725f23..f3adb4cc0 100644
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -479,7 +479,6 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/shared/conf-parser.h" />
- <Unit filename="../src/shared/output-mode.h" />
<Unit filename="../src/shared/pager.c">
<Option compilerVar="CC" />
</Unit>
diff --git a/src/shared/output-mode.h b/src/shared/output-mode.h
deleted file mode 100644
index f01297c77..000000000
--- a/src/shared/output-mode.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-/***
- This file is part of systemd.
-
- Copyright 2013 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/>.
-***/
-
-#if 0 /// UNNEEDED by elogind
-typedef enum OutputMode {
- OUTPUT_SHORT,
- OUTPUT_SHORT_ISO,
- OUTPUT_SHORT_PRECISE,
- OUTPUT_SHORT_MONOTONIC,
- OUTPUT_VERBOSE,
- OUTPUT_EXPORT,
- OUTPUT_JSON,
- OUTPUT_JSON_PRETTY,
- OUTPUT_JSON_SSE,
- OUTPUT_CAT,
- _OUTPUT_MODE_MAX,
- _OUTPUT_MODE_INVALID = -1
-} OutputMode;
-#endif // 0
-
-typedef enum OutputFlags {
- OUTPUT_SHOW_ALL = 1 << 0,
- OUTPUT_FOLLOW = 1 << 1,
- OUTPUT_WARN_CUTOFF = 1 << 2,
- OUTPUT_FULL_WIDTH = 1 << 3,
- OUTPUT_COLOR = 1 << 4,
- OUTPUT_CATALOG = 1 << 5,
- OUTPUT_BEGIN_NEWLINE = 1 << 6,
- OUTPUT_UTC = 1 << 7,
-} OutputFlags;
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
deleted file mode 100644
index 82acdd33e..000000000
--- a/src/test/test-signal-util.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/***
- This file is part of elogind.
-
- Copyright 2016 Lennart Poettering
-
- elogind 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.
-
- elogind 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 elogind; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include "signal-util.h"
-
-static void test_block_signals(void) {
- sigset_t ss;
-
- assert_se(sigprocmask(0, NULL, &ss) >= 0);
-
- assert_se(sigismember(&ss, SIGUSR1) == 0);
- assert_se(sigismember(&ss, SIGALRM) == 0);
- assert_se(sigismember(&ss, SIGVTALRM) == 0);
-
- {
- BLOCK_SIGNALS(SIGUSR1, SIGVTALRM);
-
- assert_se(sigprocmask(0, NULL, &ss) >= 0);
- assert_se(sigismember(&ss, SIGUSR1) == 1);
- assert_se(sigismember(&ss, SIGALRM) == 0);
- assert_se(sigismember(&ss, SIGVTALRM) == 1);
-
- }
-
- assert_se(sigprocmask(0, NULL, &ss) >= 0);
- assert_se(sigismember(&ss, SIGUSR1) == 0);
- assert_se(sigismember(&ss, SIGALRM) == 0);
- assert_se(sigismember(&ss, SIGVTALRM) == 0);
-}
-
-int main(int argc, char *argv[]) {
- test_block_signals();
-}