Re: [hackers] [vis] [PATCH] Rename stderr field to err

2016-01-31 Thread Marc André Tanner
On Sun, Jan 31, 2016 at 05:36:49PM +0100, Markus Teich wrote:
> The name `stderr` was confused by the compiler with the following defines:

Thanks, applied.

-- 
 Marc André Tanner >< http://www.brain-dump.org/ >< GPG key: 10C93617



[hackers] [vis] [PATCH] Rename stderr field to err

2016-01-31 Thread Markus Teich
The name `stderr` was confused by the compiler with the following defines:
$ grep -r "define stderr"
./dependency/install/usr/include/stdio.h:#define stderr (stderr)
./dependency/sources/musl-1.1.12/include/stdio.h:#define stderr (stderr)
---
 vis-cmds.c | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/vis-cmds.c b/vis-cmds.c
index bc23193..9b2c887 100644
--- a/vis-cmds.c
+++ b/vis-cmds.c
@@ -36,7 +36,7 @@ typedef struct {/* used to keep context when dealing 
with external proce
Vis *vis;   /* editor instance */
Text *txt;  /* text into which received data will be inserted */
size_t pos; /* position at which to insert new data */
-   Buffer stderr;  /* used to store everything the process writes to 
stderr */
+   Buffer err; /* used to store everything the process writes to 
stderr */
 } Filter;
 
 /** ':'-command implementations */
@@ -815,7 +815,7 @@ static ssize_t read_stdout(void *context, char *data, 
size_t len) {
 
 static ssize_t read_stderr(void *context, char *data, size_t len) {
Filter *filter = context;
-   buffer_append(&filter->stderr, data, len);
+   buffer_append(&filter->err, data, len);
return len;
 }
 
@@ -829,7 +829,7 @@ static bool cmd_filter(Vis *vis, Filerange *range, enum 
CmdOpt opt, const char *
.pos = range->end != EPOS ? range->end : view_cursor_get(view),
};
 
-   buffer_init(&filter.stderr);
+   buffer_init(&filter.err);
 
/* The general idea is the following:
 *
@@ -864,12 +864,12 @@ static bool cmd_filter(Vis *vis, Filerange *range, enum 
CmdOpt opt, const char *
vis_info_show(vis, "Command cancelled");
else if (status == 0)
vis_info_show(vis, "Command succeded");
-   else if (filter.stderr.len > 0)
-   vis_info_show(vis, "Command failed: %s", filter.stderr.data);
+   else if (filter.err.len > 0)
+   vis_info_show(vis, "Command failed: %s", filter.err.data);
else
vis_info_show(vis, "Command failed");
 
-   buffer_release(&filter.stderr);
+   buffer_release(&filter.err);
 
return !vis->cancel_filter && status == 0;
 }
@@ -898,7 +898,7 @@ static bool cmd_pipe(Vis *vis, Filerange *range, enum 
CmdOpt opt, const char *ar
.pos = 0,
};
 
-   buffer_init(&filter.stderr);
+   buffer_init(&filter.err);
 
int status = vis_pipe(vis, &filter, range, argv, read_stdout_new, 
read_stderr);
 
@@ -906,12 +906,12 @@ static bool cmd_pipe(Vis *vis, Filerange *range, enum 
CmdOpt opt, const char *ar
vis_info_show(vis, "Command cancelled");
else if (status == 0)
vis_info_show(vis, "Command succeded");
-   else if (filter.stderr.len > 0)
-   vis_info_show(vis, "Command failed: %s", filter.stderr.data);
+   else if (filter.err.len > 0)
+   vis_info_show(vis, "Command failed: %s", filter.err.data);
else
vis_info_show(vis, "Command failed");
 
-   buffer_release(&filter.stderr);
+   buffer_release(&filter.err);
 
return !vis->cancel_filter && status == 0;
 }
-- 
2.4.10




Re: [hackers][vis][PATCH] Don't use an offset of 1 for the 'L' command by default

2016-01-31 Thread Marc André Tanner
Thanks for the patch! I think I fixed the issue in a slightly different way.

-- 
 Marc André Tanner >< http://www.brain-dump.org/ >< GPG key: 10C93617