[systemd-commits] 2 commits - src/escape src/shared src/test

[Zbigniew Jędrzejewski-Szmek]

 src/escape/escape.c      |    2 +-
 src/shared/path-lookup.c |    7 -------
 src/shared/path-lookup.h |    3 ---
 src/test/test-tables.c   |    1 -
 4 files changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 69a67d6aaec068654c0431e9156a91afcf75b7dd
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Jan 6 21:26:20 2014 -0500

    core: remove systemd_running_as lookup functions
    
    They are unused and unlikely to ever be.

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 7d53d85..46cfc12 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -32,13 +32,6 @@
 #include "path-util.h"
 #include "path-lookup.h"
 
-static const char* const systemd_running_as_table[_SYSTEMD_RUNNING_AS_MAX] = {
-        [SYSTEMD_SYSTEM] = "system",
-        [SYSTEMD_USER] = "user"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(systemd_running_as, SystemdRunningAs);
-
 int user_config_home(char **config_home) {
         const char *e;
         char *r;
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
index 4c77bee..2fe8173 100644
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -40,9 +40,6 @@ typedef enum SystemdRunningAs {
 
 #define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)
 
-const char* systemd_running_as_to_string(SystemdRunningAs i) _const_;
-SystemdRunningAs systemd_running_as_from_string(const char *s) _pure_;
-
 int user_config_home(char **config_home);
 
 int lookup_paths_init(LookupPaths *p,
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 9fc4d93..cb9185e 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -104,7 +104,6 @@ int main(int argc, char **argv) {
         test_table(swap_exec_command, SWAP_EXEC_COMMAND);
         test_table(swap_result, SWAP_RESULT);
         test_table(swap_state, SWAP_STATE);
-        test_table(systemd_running_as, SYSTEMD_RUNNING_AS);
         test_table(target_state, TARGET_STATE);
         test_table(timer_base, TIMER_BASE);
         test_table(timer_result, TIMER_RESULT);

commit 91a81d93b569a98e04566eef1753a0956ba035f3
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Jul 19 15:35:48 2014 -0400

    escape: fix return code

diff --git a/src/escape/escape.c b/src/escape/escape.c
index ae0c183..ba2fb47 100644
--- a/src/escape/escape.c
+++ b/src/escape/escape.c
@@ -235,5 +235,5 @@ int main(int argc, char *argv[]) {
         fputc('\n', stdout);
 
 finish:
-        return r ? EXIT_FAILURE : EXIT_SUCCESS;
+        return r <= 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }