diff options
| author | Douglas Schneider <ds3@ualberta.ca> | 2014-05-26 10:16:25 -0600 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-06-13 18:08:20 -0400 |
| commit | f9596aa201b6f574d851850096fdd071e957fa15 (patch) | |
| tree | 4e9f06049001615c78f528655a47565e230f7e4a | |
| parent | 5b3b3fd3ed4372866730ae857e8c09d6e5d1167d (diff) | |
| download | rneovim-f9596aa201b6f574d851850096fdd071e957fa15.tar.gz rneovim-f9596aa201b6f574d851850096fdd071e957fa15.tar.bz2 rneovim-f9596aa201b6f574d851850096fdd071e957fa15.zip | |
Replace vim_strncpy calls: add STRLCPY
| -rw-r--r-- | src/nvim/memory.c | 1 | ||||
| -rw-r--r-- | src/nvim/vim.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/memory.c b/src/nvim/memory.c index d968aa2bd2..3c6430f311 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -1,6 +1,5 @@ // Various routines dealing with allocation and deallocation of memory. -#include <stdlib.h> #include <string.h> #include "nvim/vim.h" diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 2b0d7ea954..9c8bbe47d8 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -8,6 +8,7 @@ #ifndef NVIM_VIM_H # define NVIM_VIM_H +#include "nvim/memory.h"// for xstrlcpy #include "nvim/types.h" /* Included when ported to cmake */ @@ -834,6 +835,7 @@ typedef enum { #define STRLEN(s) strlen((char *)(s)) #define STRCPY(d, s) strcpy((char *)(d), (char *)(s)) #define STRNCPY(d, s, n) strncpy((char *)(d), (char *)(s), (size_t)(n)) +#define STRLCPY(d, s, n) xstrlcpy((char *)(d), (char *)(s), (size_t)(n)) #define STRCMP(d, s) strcmp((char *)(d), (char *)(s)) #define STRNCMP(d, s, n) strncmp((char *)(d), (char *)(s), (size_t)(n)) #ifdef HAVE_STRCASECMP |