aboutsummaryrefslogtreecommitdiff
path: root/src/os/shell.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-05-01 14:00:13 -0400
committerJustin M. Keyes <justinkz@gmail.com>2014-05-01 14:00:31 -0400
commit1b5217687abf8e1aeabaf4e5a64073177d56e593 (patch)
treece4bac12fff08088724bee38bee9d96d33bfe416 /src/os/shell.c
parent3b77a62a77970a1c1aff5d50df396171ce24b464 (diff)
downloadrneovim-1b5217687abf8e1aeabaf4e5a64073177d56e593.tar.gz
rneovim-1b5217687abf8e1aeabaf4e5a64073177d56e593.tar.bz2
rneovim-1b5217687abf8e1aeabaf4e5a64073177d56e593.zip
revert #652
reverting broad cosmetic/style change because: - increases merge-conflicts - increases overhead of merging upstream Vim patches - reasons for change are ambiguous, so default to no change
Diffstat (limited to 'src/os/shell.c')
-rw-r--r--src/os/shell.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/os/shell.c b/src/os/shell.c
index 7e5f5fd41e..d14e355d19 100644
--- a/src/os/shell.c
+++ b/src/os/shell.c
@@ -251,14 +251,14 @@ static int tokenize(char_u *str, char **argv)
int argc = 0, len;
char_u *p = str;
- while (*p != '\0') {
+ while (*p != NUL) {
len = word_length(p);
if (argv != NULL) {
// Fill the slot
argv[argc] = xmalloc(len + 1);
memcpy(argv[argc], p, len);
- argv[argc][len] = '\0';
+ argv[argc][len] = NUL;
}
argc++;
@@ -323,7 +323,7 @@ static void write_selection(uv_write_t *req)
buflen *= 2;
pdata->wbuffer = xrealloc(pdata->wbuffer, buflen);
}
- pdata->wbuffer[off++] = '\0';
+ pdata->wbuffer[off++] = NUL;
} else {
char_u *s = vim_strchr(lp + written, NL);
len = s == NULL ? l : s - (lp + written);
@@ -405,7 +405,7 @@ static void read_cb(uv_stream_t *stream, ssize_t cnt, const uv_buf_t *buf)
if (pdata->rbuffer[i] == NL) {
// Insert the line
append_ga_line(&pdata->ga);
- } else if (pdata->rbuffer[i] == '\0') {
+ } else if (pdata->rbuffer[i] == NUL) {
// Translate NUL to NL
ga_append(&pdata->ga, NL);
} else {