aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 8.2.0375: Coverity warning for not using return value

Browse Source 
Problem:    Coverity warning for not using return value.
Solution:   Move error message to separate function.
This commit is contained in:
Bram Moolenaar
2020-03-13 14:34:38 +01:00
parent 8a677a37d0
commit 8210693795
2 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/popupwin.c
View File

@@ -2492,6 +2492,31 @@ popup_free(win_T *wp)
popup_mask_refresh = TRUE; popup_mask_refresh = TRUE;
} }
static void
error_for_popup_window(void)
{
emsg(_("E994: Not allowed in a popup window"));
}
int
error_if_popup_window(int also_with_term UNUSED)
{
// win_execute() may set "curwin" to a popup window temporarily, but many
// commands are disallowed then. When a terminal runs in the popup most
// things are allowed. When a terminal is finished it can be closed.
if (WIN_IS_POPUP(curwin)
# ifdef FEAT_TERMINAL
&& (also_with_term || curbuf->b_term == NULL)
&& !term_is_finished(curbuf)
# endif
)
{
error_for_popup_window();
return TRUE;
}
return FALSE;
}
/* /*
* Close a popup window by Window-id. * Close a popup window by Window-id.
* Does not invoke the callback. * Does not invoke the callback.
@@ -2509,7 +2534,7 @@ popup_close(int id)
{ {
if (wp == curwin) if (wp == curwin)
{ {
ERROR_IF_ANY_POPUP_WINDOW; error_for_popup_window();
return; return;
} }
if (prev == NULL) if (prev == NULL)
@@ -2540,7 +2565,7 @@ popup_close_tabpage(tabpage_T *tp, int id)
{ {
if (wp == curwin) if (wp == curwin)
{ {
ERROR_IF_ANY_POPUP_WINDOW; error_for_popup_window();
return; return;
} }
if (prev == NULL) if (prev == NULL)
@@ -2888,25 +2913,6 @@ f_popup_getoptions(typval_T *argvars, typval_T *rettv)
} }
} }
int
error_if_popup_window(int also_with_term UNUSED)
{
// win_execute() may set "curwin" to a popup window temporarily, but many
// commands are disallowed then. When a terminal runs in the popup most
// things are allowed. When a terminal is finished it can be closed.
if (WIN_IS_POPUP(curwin)
# ifdef FEAT_TERMINAL
&& (also_with_term || curbuf->b_term == NULL)
&& !term_is_finished(curbuf)
# endif
)
{
emsg(_("E994: Not allowed in a popup window"));
return TRUE;
}
return FALSE;
}
# if defined(FEAT_TERMINAL) || defined(PROTO) # if defined(FEAT_TERMINAL) || defined(PROTO)
/* /*
* Return TRUE if the current window is running a terminal in a popup window. * Return TRUE if the current window is running a terminal in a popup window.

2
src/version.c
View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
375,
/**/ /**/
374, 374,
/**/ /**/