aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorCraig Barnes <craigbarnes@protonmail.com>2024-08-03 07:12:13 +0000
committerCraig Barnes <craigbarnes@protonmail.com>2024-08-03 07:51:06 +0000
commitf87c9bb9f70f1a6c8c7081c762c15ba7eaaf971e (patch)
treeaa30277b7b180ec4af22163aebf63686fc93e0be /main.c
parentchangelog: add new 'unreleased' section (diff)
xmalloc: remove delim param from xstrjoin() and add separate xstrjoin3()
This avoids the need for an unused third argument for most xstrjoin() calls and replaces the cases where it's needed with a more flexible function. Code generation is the same in both cases, when there are 2 string params and a compile-time known delimiter. This commit also converts 4 uses of xasprintf() to use xstrjoin*(). See also: https://godbolt.org/z/xsjrhv9b6
Diffstat (limited to 'main.c')
-rw-r--r--main.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/main.c b/main.c
index a6ec1cb7..f46d712e 100644
--- a/main.c
+++ b/main.c
@@ -258,7 +258,7 @@ main(int argc, char *const *argv)
break;
case 't':
- tll_push_back(overrides, xstrjoin("term=", optarg, 0));
+ tll_push_back(overrides, xstrjoin("term=", optarg));
break;
case 'L':
@@ -266,11 +266,11 @@ main(int argc, char *const *argv)
break;
case 'T':
- tll_push_back(overrides, xstrjoin("title=", optarg, 0));
+ tll_push_back(overrides, xstrjoin("title=", optarg));
break;
case 'a':
- tll_push_back(overrides, xstrjoin("app-id=", optarg, 0));
+ tll_push_back(overrides, xstrjoin("app-id=", optarg));
break;
case 'D': {
@@ -284,7 +284,7 @@ main(int argc, char *const *argv)
}
case 'f': {
- char *font_override = xstrjoin("font=", optarg, 0);
+ char *font_override = xstrjoin("font=", optarg);
tll_push_back(overrides, font_override);
break;
}
@@ -658,15 +658,19 @@ out:
UNITTEST
{
- char *s = xstrjoin("foo", "bar", 0);
+ char *s = xstrjoin("foo", "bar");
xassert(streq(s, "foobar"));
free(s);
- s = xstrjoin("foo", "bar", ' ');
+ s = xstrjoin3("foo", " ", "bar");
xassert(streq(s, "foo bar"));
free(s);
- s = xstrjoin("foo", "bar", ',');
+ s = xstrjoin3("foo", ",", "bar");
xassert(streq(s, "foo,bar"));
free(s);
+
+ s = xstrjoin3("foo", "bar", "baz");
+ xassert(streq(s, "foobarbaz"));
+ free(s);
}