From 7941aaa3bf1acfff4fcf910c76186252e9ae3f6c Mon Sep 17 00:00:00 2001 From: ZyX Date: Wed, 11 Jan 2017 20:56:45 +0300 Subject: macros: Rename LAST_ARRAY_ENTRY to ARRAY_LAST_ENTRY --- src/nvim/macros.h | 2 +- src/nvim/shada.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nvim/macros.h b/src/nvim/macros.h index e802ba2aed..348df2d9b6 100644 --- a/src/nvim/macros.h +++ b/src/nvim/macros.h @@ -150,7 +150,7 @@ /// /// This should be called with a real array. Calling this with a pointer is an /// error. -#define LAST_ARRAY_ENTRY(arr) (arr)[ARRAY_SIZE(arr) - 1] +#define ARRAY_LAST_ENTRY(arr) (arr)[ARRAY_SIZE(arr) - 1] // Duplicated in os/win_defs.h to avoid include-order sensitivity. #define RGB_(r, g, b) ((r << 16) | (g << 8) | b) diff --git a/src/nvim/shada.c b/src/nvim/shada.c index f0ab1ff73f..fbee9beacc 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -2426,8 +2426,8 @@ static inline void replace_numbered_mark(WriteMergerState *const wms, const PossiblyFreedShadaEntry entry) FUNC_ATTR_NONNULL_ALL FUNC_ATTR_ALWAYS_INLINE { - if (LAST_ARRAY_ENTRY(wms->numbered_marks).can_free_entry) { - shada_free_shada_entry(&LAST_ARRAY_ENTRY(wms->numbered_marks).data); + if (ARRAY_LAST_ENTRY(wms->numbered_marks).can_free_entry) { + shada_free_shada_entry(&ARRAY_LAST_ENTRY(wms->numbered_marks).data); } for (size_t i = idx; i < ARRAY_SIZE(wms->numbered_marks) - 1; i++) { if (wms->numbered_marks[i].data.type == kSDItemGlobalMark) { -- cgit