summaryrefslogtreecommitdiff
path: root/sway/stringop.c
diff options
context:
space:
mode:
authorDrew DeVault <[email protected]>2015-09-12 10:29:11 -0400
committerDrew DeVault <[email protected]>2015-09-12 10:29:11 -0400
commit9c8f1fb9649c5673cd6b42230c0784f099a62db7 (patch)
treebb5eccfddb8b8d56e387327908490daeca2c42a7 /sway/stringop.c
parentf5343adae4d631e4cdade7869b4d73fc97b4ac5f (diff)
parentf76f9e2eea15ee4606c23139e9a4c8ce41a4ab18 (diff)
Merge pull request #179 from taiyu-len/master
new_workspace null behavior + testmap functions + regex
Diffstat (limited to 'sway/stringop.c')
-rw-r--r--sway/stringop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/stringop.c b/sway/stringop.c
index 191e40c8..54faf74c 100644
--- a/sway/stringop.c
+++ b/sway/stringop.c
@@ -258,7 +258,7 @@ int unescape_string(char *string) {
return len - shift;
}
-char *join_args(char **argv, int argc) {
+char *join_args(int argc, char **argv) {
int len = 0, i;
for (i = 0; i < argc; ++i) {
len += strlen(argv[i]) + 1;