diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-05-01 14:00:13 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-01 14:00:31 -0400 |
| commit | 1b5217687abf8e1aeabaf4e5a64073177d56e593 (patch) | |
| tree | ce4bac12fff08088724bee38bee9d96d33bfe416 /src/memfile.c | |
| parent | 3b77a62a77970a1c1aff5d50df396171ce24b464 (diff) | |
| download | rneovim-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/memfile.c')
| -rw-r--r-- | src/memfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/memfile.c b/src/memfile.c index fa5b604304..9f8d482768 100644 --- a/src/memfile.c +++ b/src/memfile.c @@ -540,7 +540,7 @@ int mf_sync(memfile_T *mfp, int flags) if (hp == NULL || status == FAIL) mfp->mf_dirty = FALSE; - if ((flags & MFS_FLUSH) && *p_sws != '\0') { + if ((flags & MFS_FLUSH) && *p_sws != NUL) { #if defined(UNIX) # ifdef HAVE_FSYNC if (STRCMP(p_sws, "fsync") == 0) { @@ -838,7 +838,7 @@ static int mf_read(memfile_T *mfp, bhdr_T *hp) } /* Decrypt if 'key' is set and this is a data block. */ - if (*mfp->mf_buffer->b_p_key != '\0') + if (*mfp->mf_buffer->b_p_key != NUL) ml_decrypt_data(mfp, hp->bh_data, offset, size); return OK; @@ -926,7 +926,7 @@ static int mf_write_block(memfile_T *mfp, bhdr_T *hp, off_t offset, unsigned siz int result = OK; /* Encrypt if 'key' is set and this is a data block. */ - if (*mfp->mf_buffer->b_p_key != '\0') { + if (*mfp->mf_buffer->b_p_key != NUL) { data = ml_encrypt_data(mfp, data, offset, size); } |