===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-if-shell.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- src/usr.bin/tmux/cmd-if-shell.c	2016/10/16 19:04:05	1.48
+++ src/usr.bin/tmux/cmd-if-shell.c	2017/01/15 22:00:56	1.49
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-if-shell.c,v 1.48 2016/10/16 19:04:05 nicm Exp $ */
+/* $OpenBSD: cmd-if-shell.c,v 1.49 2017/01/15 22:00:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -96,7 +96,8 @@
 		free(shellcmd);
 		if (cmd == NULL)
 			return (CMD_RETURN_NORMAL);
-		if (cmd_string_parse(cmd, &cmdlist, NULL, 0, &cause) != 0) {
+		cmdlist = cmd_string_parse(cmd, NULL, 0, &cause);
+		if (cmdlist == NULL) {
 			if (cause != NULL) {
 				cmdq_error(item, "%s", cause);
 				free(cause);
@@ -167,7 +168,8 @@
 	if (cmd == NULL)
 		goto out;
 
-	if (cmd_string_parse(cmd, &cmdlist, file, line, &cause) != 0) {
+	cmdlist = cmd_string_parse(cmd, file, line, &cause);
+	if (cmdlist == NULL) {
 		if (cause != NULL)
 			new_item = cmdq_get_callback(cmd_if_shell_error, cause);
 		else