diff options
| author | John Schmidt <john.schmidt.h@gmail.com> | 2014-04-22 11:35:11 +0200 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-04-28 07:41:45 -0300 |
| commit | 4e1b364a3e255742522d4d76c5ccddd7a36c1769 (patch) | |
| tree | 667a250396bc009ec56f3dad563882b9367b4441 /src/fileio.c | |
| parent | c70a526a5df2b8a7353c3c71e241cd51bf099a64 (diff) | |
| download | rneovim-4e1b364a3e255742522d4d76c5ccddd7a36c1769.tar.gz rneovim-4e1b364a3e255742522d4d76c5ccddd7a36c1769.tar.bz2 rneovim-4e1b364a3e255742522d4d76c5ccddd7a36c1769.zip | |
Remove `alloc_clear`
Use `xcalloc` instead.
Inline `alloc_tv` and `alloc_string_tv` in eval.c
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/fileio.c b/src/fileio.c index aa0368b9ba..3ea06b2aef 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2361,14 +2361,13 @@ int prepare_crypt_read(FILE *fp) */ char_u *prepare_crypt_write(buf_T *buf, int *lenp) { - char_u *header; + char_u *header = xcalloc(1, CRYPT_MAGIC_LEN + CRYPT_SALT_LEN_MAX + + CRYPT_SEED_LEN_MAX + 2); int seed_len = crypt_seed_len[get_crypt_method(buf)]; int salt_len = crypt_salt_len[get_crypt_method(buf)]; char_u *salt; char_u *seed; - header = alloc_clear(CRYPT_MAGIC_LEN + CRYPT_SALT_LEN_MAX - + CRYPT_SEED_LEN_MAX + 2); crypt_push_state(); use_crypt_method = get_crypt_method(buf); /* select zip or blowfish */ vim_strncpy(header, (char_u *)crypt_magic[use_crypt_method], |