updated for version 7.3.400
Problem: Compiler warnings for shadowed variables.
Solution: Remove or rename the variables.
diff --git a/src/os_unix.c b/src/os_unix.c
index cdf5abe..30593ef 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3884,7 +3884,6 @@
char_u *p_shcf_copy = NULL;
int i;
char_u *p;
- char_u *s;
int inquote;
int pty_master_fd = -1; /* for pty's */
# ifdef FEAT_GUI
@@ -3963,6 +3962,8 @@
}
if (cmd != NULL)
{
+ char_u *s;
+
if (extra_shell_arg != NULL)
argv[argc++] = (char *)extra_shell_arg;
@@ -4325,7 +4326,6 @@
linenr_T lnum = curbuf->b_op_start.lnum;
int written = 0;
char_u *lp = ml_get(lnum);
- char_u *s;
size_t l;
close(fromshell_fd);
@@ -4339,7 +4339,8 @@
len = write(toshell_fd, "", (size_t)1);
else
{
- s = vim_strchr(lp + written, NL);
+ char_u *s = vim_strchr(lp + written, NL);
+
len = write(toshell_fd, (char *)lp + written,
s == NULL ? l
: (size_t)(s - (lp + written)));