From 8085f163c50d998f3e30a6ddfc72c73d5dc57747 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 11 Mar 2014 10:41:22 -0400 Subject: util: allow strappenda to take any number of args This makes strappenda3 redundant, so we remove its usage and definition. Add a few tests along the way for sanity. --- src/test/test-util.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/test/test-util.c') diff --git a/src/test/test-util.c b/src/test/test-util.c index 16f89b4716..69e3f5d3ae 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -907,6 +907,19 @@ static void test_strshorten(void) { assert_se(strlen(strshorten(s, 0)) == 0); } +static void test_strappenda(void) { + char *actual; + + actual = strappenda("", "foo", "bar"); + assert_se(streq(actual, "foobar")); + + actual = strappenda("foo", "bar", "baz"); + assert_se(streq(actual, "foobarbaz")); + + actual = strappenda("foo", "", "bar", "baz"); + assert_se(streq(actual, "foobarbaz")); +} + int main(int argc, char *argv[]) { log_parse_environment(); log_open(); @@ -965,6 +978,7 @@ int main(int argc, char *argv[]) { test_read_one_char(); test_ignore_signals(); test_strshorten(); + test_strappenda(); return 0; } -- cgit v1.2.3-54-g00ecf