From c50e4f95d8cfcd21bde2b0d1ff24b4de8fef4976 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 11 Feb 2014 16:45:15 +0100 Subject: [PATCH] util: drop parse_user_at_host() since its unused now --- src/shared/util.c | 14 -------------- src/shared/util.h | 1 - src/test/test-util.c | 16 ---------------- 3 files changed, 31 deletions(-) diff --git a/src/shared/util.c b/src/shared/util.c index f76ed6f56..21edd3ac2 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -5838,20 +5838,6 @@ bool id128_is_valid(const char *s) { return true; } -void parse_user_at_host(char *arg, char **user, char **host) { - assert(arg); - assert(user); - assert(host); - - *host = strchr(arg, '@'); - if (*host == NULL) - *host = arg; - else { - *host[0]++ = '\0'; - *user = arg; - } -} - int split_pair(const char *s, const char *sep, char **l, char **r) { char *x, *a, *b; diff --git a/src/shared/util.h b/src/shared/util.h index 219e4897b..9aea3a4e5 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -833,7 +833,6 @@ static inline void _reset_locale_(struct _locale_struct_ *s) { _saved_locale_.quit = true) bool id128_is_valid(const char *s) _pure_; -void parse_user_at_host(char *arg, char **user, char **host); int split_pair(const char *s, const char *sep, char **l, char **r); diff --git a/src/test/test-util.c b/src/test/test-util.c index 9d6f4be50..cbd60d68f 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -490,21 +490,6 @@ static void test_strrep(void) { assert_se(streq(zero, "")); } -static void test_parse_user_at_host(void) { - _cleanup_free_ char *both = strdup("waldo@waldoscomputer"); - _cleanup_free_ char *onlyhost = strdup("mikescomputer"); - char *user = NULL, *host = NULL; - - parse_user_at_host(both, &user, &host); - assert_se(streq(user, "waldo")); - assert_se(streq(host, "waldoscomputer")); - - user = host = NULL; - parse_user_at_host(onlyhost, &user, &host); - assert_se(user == NULL); - assert_se(streq(host, "mikescomputer")); -} - static void test_split_pair(void) { _cleanup_free_ char *a = NULL, *b = NULL; @@ -635,7 +620,6 @@ int main(int argc, char *argv[]) { test_parse_bytes(); test_strextend(); test_strrep(); - test_parse_user_at_host(); test_split_pair(); test_fstab_node_to_udev_node(); test_get_files_in_directory(); -- 2.30.2