diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-06-16 20:27:25 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-06-16 20:27:25 -0400 |
| commit | d199d18159c624844c9c8052d1a98b91084fb803 (patch) | |
| tree | 827dd9c4f8f1f6ef73ff1f20a609d08e36640986 /src/nvim/menu.c | |
| parent | 8bbeb4b480a72d0099a18c4d8200313600045231 (diff) | |
| parent | e85598e5a91c714c10034b6b3986a666065d1078 (diff) | |
| download | rneovim-d199d18159c624844c9c8052d1a98b91084fb803.tar.gz rneovim-d199d18159c624844c9c8052d1a98b91084fb803.tar.bz2 rneovim-d199d18159c624844c9c8052d1a98b91084fb803.zip | |
Merge #787 'removal of redundant OOM error handling'
Diffstat (limited to 'src/nvim/menu.c')
| -rw-r--r-- | src/nvim/menu.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/nvim/menu.c b/src/nvim/menu.c index 4f45aa9e34..4d75bc1475 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -186,11 +186,8 @@ ex_menu ( for (i = 0; i < MENU_INDEX_TIP; ++i) if (modes & (1 << i)) { p = popup_mode_name(menu_path, i); - if (p != NULL) { - menu_nable_recurse(root_menu, p, MENU_ALL_MODES, - enable); - free(p); - } + menu_nable_recurse(root_menu, p, MENU_ALL_MODES, enable); + free(p); } } menu_nable_recurse(root_menu, menu_path, modes, enable); @@ -208,10 +205,8 @@ ex_menu ( for (i = 0; i < MENU_INDEX_TIP; ++i) if (modes & (1 << i)) { p = popup_mode_name(menu_path, i); - if (p != NULL) { - remove_menu(&root_menu, p, MENU_ALL_MODES, TRUE); - free(p); - } + remove_menu(&root_menu, p, MENU_ALL_MODES, TRUE); + free(p); } } @@ -242,13 +237,10 @@ ex_menu ( for (i = 0; i < MENU_INDEX_TIP; ++i) if (modes & (1 << i)) { p = popup_mode_name(menu_path, i); - if (p != NULL) { - /* Include all modes, to make ":amenu" work */ - menuarg.modes = modes; - add_menu_path(p, &menuarg, pri_tab, map_to - ); - free(p); - } + // Include all modes, to make ":amenu" work + menuarg.modes = modes; + add_menu_path(p, &menuarg, pri_tab, map_to); + free(p); } } @@ -1153,10 +1145,9 @@ get_menu_cmd_modes ( */ static char_u *popup_mode_name(char_u *name, int idx) { - char_u *p; int len = (int)STRLEN(name); - p = vim_strnsave(name, len + 1); + char_u *p = vim_strnsave(name, len + 1); memmove(p + 6, p + 5, (size_t)(len - 4)); p[5] = menu_mode_chars[idx]; |