From d22d0cd31133c73366d65e38cddc3cf0f9a02918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sat, 2 Apr 2016 09:13:32 +0200 Subject: sam: restructure code to avoid useless goto --- sam.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/sam.c b/sam.c index b3fa8fe..ed8cafe 100644 --- a/sam.c +++ b/sam.c @@ -900,15 +900,11 @@ static bool cmd_files(Vis *vis, Win *win, Command *cmd, const char *argv[], File } static bool cmd_substitute(Vis *vis, Win *win, Command *cmd, const char *argv[], Filerange *range) { - bool ret = false; Buffer buf; buffer_init(&buf); - - if (!buffer_put0(&buf, "s") || !buffer_append0(&buf, argv[1])) - goto out; - - ret = cmd_filter(vis, win, cmd, (const char*[]){ argv[0], "sed", buf.data, NULL }, range); -out: + bool ret = false; + if (buffer_put0(&buf, "s") && buffer_append0(&buf, argv[1])) + ret = cmd_filter(vis, win, cmd, (const char*[]){ argv[0], "sed", buf.data, NULL }, range); buffer_release(&buf); return ret; } @@ -961,16 +957,11 @@ static bool cmd_write(Vis *vis, Win *win, Command *cmd, const char *argv[], File } static bool cmd_read(Vis *vis, Win *win, Command *cmd, const char *argv[], Filerange *range) { - - bool ret = false; Buffer buf; buffer_init(&buf); - - if (!buffer_put0(&buf, "cat ") || !buffer_append0(&buf, argv[1])) - goto out; - - ret = cmd_pipein(vis, win, cmd, (const char*[]){ argv[0], buf.data, NULL }, range); -out: + bool ret = false; + if (buffer_put0(&buf, "cat ") && buffer_append0(&buf, argv[1])) + ret = cmd_pipein(vis, win, cmd, (const char*[]){ argv[0], buf.data, NULL }, range); buffer_release(&buf); return ret; } -- cgit v1.2.3