summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-03-26 11:18:59 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-05-20 14:28:56 +1000
commit7d49aed124ca9bb06e3315e2cd14e8e30a51272e (patch)
tree43b23de1281830cfd58e82f4d1d43300ae3ca661
parent04ebcf9eca27db8e4a659ffe7b1301c93191fccb (diff)
downloadxf86-input-wacom-7d49aed124ca9bb06e3315e2cd14e8e30a51272e.tar.gz
xsetwacom: fix strjoinsplit.
silly. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Ping Cheng <pinglinux@gmail.com> (cherry picked from commit 967f90c75a7ad17c8e26bb89f5b348c43bbd146e)
-rw-r--r--tools/xsetwacom.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/xsetwacom.c b/tools/xsetwacom.c
index aa4e757..c792987 100644
--- a/tools/xsetwacom.c
+++ b/tools/xsetwacom.c
@@ -1252,8 +1252,9 @@ static char** strjoinsplit(int argc, char **argv, int *nwords)
if (strlen(buff) + strlen(*argv) + 1 >= sizeof(buff))
break;
- strcat(buff, (const char*)(*argv)++);
+ strcat(buff, *argv);
strcat(buff, " ");
+ argv++;
}
*nwords = 0;