Mercurial > vim
changeset 9570:695186e11daa v7.4.2062
commit https://github.com/vim/vim/commit/840268400dc8fda62a14f8a084e8b1ea46619454
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 17 20:37:43 2016 +0200
patch 7.4.2062
Problem: Using dummy variable to compute struct member offset.
Solution: Use offsetof().
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 17 Jul 2016 20:45:05 +0200 |
parents | 342fef71ac00 |
children | 5eaa708ab50d |
files | src/globals.h src/macros.h src/spell.c src/version.c src/vim.h |
diffstat | 5 files changed, 17 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/globals.h +++ b/src/globals.h @@ -1649,18 +1649,6 @@ EXTERN int did_add_timer INIT(= FALSE); #ifdef FEAT_EVAL EXTERN time_T time_for_testing INIT(= 0); -/* - * In a hashtab item "hi_key" points to "di_key" in a dictitem. - * This avoids adding a pointer to the hashtab item. - * DI2HIKEY() converts a dictitem pointer to a hashitem key pointer. - * HIKEY2DI() converts a hashitem key pointer to a dictitem pointer. - * HI2DI() converts a hashitem pointer to a dictitem pointer. - */ -EXTERN dictitem_T dumdi; -# define DI2HIKEY(di) ((di)->di_key) -# define HIKEY2DI(p) ((dictitem_T *)(p - (dumdi.di_key - (char_u *)&dumdi))) -# define HI2DI(hi) HIKEY2DI((hi)->hi_key) - /* Abort conversion to string after a recursion error. */ EXTERN int did_echo_string_emsg INIT(= FALSE); #endif
--- a/src/macros.h +++ b/src/macros.h @@ -353,3 +353,14 @@ # endif # endif #endif + +/* + * In a hashtab item "hi_key" points to "di_key" in a dictitem. + * This avoids adding a pointer to the hashtab item. + * DI2HIKEY() converts a dictitem pointer to a hashitem key pointer. + * HIKEY2DI() converts a hashitem key pointer to a dictitem pointer. + * HI2DI() converts a hashitem pointer to a dictitem pointer. + */ +# define DI2HIKEY(di) ((di)->di_key) +# define HIKEY2DI(p) ((dictitem_T *)(p - offsetof(dictitem_T, di_key))) +# define HI2DI(hi) HIKEY2DI((hi)->hi_key)
--- a/src/spell.c +++ b/src/spell.c @@ -600,8 +600,7 @@ typedef struct wordcount_S char_u wc_word[1]; /* word, actually longer */ } wordcount_T; -static wordcount_T dumwc; -#define WC_KEY_OFF (unsigned)(dumwc.wc_word - (char_u *)&dumwc) +#define WC_KEY_OFF offsetof(wordcount_T, wc_word) #define HI2WC(hi) ((wordcount_T *)((hi)->hi_key - WC_KEY_OFF)) #define MAXWORDCOUNT 0xffff