IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove OOM error handling code after calls to diff_alloc_new()

Browse Source
This commit is contained in:
Felipe Oliveira Carvalho 2014-04-04 14:27:15 -03:00 committed by Thiago de Arruda
parent 86279cefae
commit b8bda77e39
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/diff.c
View File

@ -266,10 +266,6 @@ static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1,
&& !diff_busy) { && !diff_busy) {
diff_T *dnext = diff_alloc_new(tp, dprev, dp); diff_T *dnext = diff_alloc_new(tp, dprev, dp);
if (dnext == NULL) {
return;
}
dnext->df_lnum[idx] = line1; dnext->df_lnum[idx] = line1;
dnext->df_count[idx] = inserted; dnext->df_count[idx] = inserted;
int i; int i;
@ -467,14 +463,14 @@ static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1,
static diff_T* diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp) static diff_T* diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp)
{ {
diff_T *dnew = (diff_T *)alloc((unsigned)sizeof(diff_T)); diff_T *dnew = (diff_T *)alloc((unsigned)sizeof(diff_T));
if (dnew != NULL) {
dnew->df_next = dp; dnew->df_next = dp;
if (dprev == NULL) { if (dprev == NULL) {
tp->tp_first_diff = dnew; tp->tp_first_diff = dnew;
} else { } else {
dprev->df_next = dnew; dprev->df_next = dnew;
}
} }
return dnew; return dnew;
} }
@ -1372,9 +1368,6 @@ static void diff_read(int idx_orig, int idx_new, char_u *fname)
} else { } else {
// Allocate a new diffblock. // Allocate a new diffblock.
dp = diff_alloc_new(curtab, dprev, dp); dp = diff_alloc_new(curtab, dprev, dp);
if (dp == NULL) {
goto done;
}
dp->df_lnum[idx_orig] = lnum_orig; dp->df_lnum[idx_orig] = lnum_orig;
dp->df_count[idx_orig] = count_orig; dp->df_count[idx_orig] = count_orig;