diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-05-22 12:50:59 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-22 13:00:51 -0400 |
| commit | e2e47803bdfd5fb40e3dbc9cdf798bb27d306c72 (patch) | |
| tree | 6ff1b06b5d5fd6d3260f3a778c33cfaf03f0c295 /src/nvim/mark.c | |
| parent | 0aa8b5828cc0674894681841f40c3c05bfd2f07b (diff) | |
| parent | e303a11ebfc352860cce73184ece692ab4d0f01c (diff) | |
| download | rneovim-e2e47803bdfd5fb40e3dbc9cdf798bb27d306c72.tar.gz rneovim-e2e47803bdfd5fb40e3dbc9cdf798bb27d306c72.tar.bz2 rneovim-e2e47803bdfd5fb40e3dbc9cdf798bb27d306c72.zip | |
Merge #708 'Remove NULL/non-NULL tests after vim_str(n)save'
- replace alloc with xmalloc
Diffstat (limited to 'src/nvim/mark.c')
| -rw-r--r-- | src/nvim/mark.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 16d360d093..23e7355e9c 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -606,8 +606,7 @@ static char_u *mark_line(pos_T *mp, int lead_len) if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count) return vim_strsave((char_u *)"-invalid-"); s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (int)Columns); - if (s == NULL) - return NULL; + /* Truncate the line to fit it in the window */ len = 0; for (p = s; *p != NUL; mb_ptr_adv(p)) { @@ -844,8 +843,6 @@ void ex_changes(exarg_T *eap) curbuf->b_changelist[i].col); msg_outtrans(IObuff); name = mark_line(&curbuf->b_changelist[i], 17); - if (name == NULL) - break; msg_outtrans_attr(name, hl_attr(HLF_D)); free(name); ui_breakcheck(); @@ -1418,7 +1415,7 @@ void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof, int flags pos_T pos; list_T *list = NULL; - name_buf = alloc(LSIZE); + name_buf = xmalloc(LSIZE); *name_buf = NUL; if (fp_out == NULL && (flags & (VIF_GET_OLDFILES | VIF_FORCEIT))) { |