Permalink
Browse files

patch 8.0.0666: dead for loop

Problem:    Dead for loop. (Coverity)
Solution:   Remove the for loop.
  • Loading branch information...
brammool committed Jun 23, 2017
1 parent 090209b commit 5fe691240bff11e9618252486147f0156e875666
Showing with 44 additions and 47 deletions.
  1. +42 −47 src/term.c
  2. +2 −0 src/version.c
View
@@ -4601,59 +4601,54 @@ check_termcode(
|| key_name[0] == KS_SGR_MOUSE
|| key_name[0] == KS_SGR_MOUSE_RELEASE)
{
for (;;)
{
/* URXVT 1015 mouse reporting mode:
* Almost identical to xterm mouse mode, except the values
* are decimal instead of bytes.
*
* \033[%d;%d;%dM
* ^-- row
* ^----- column
* ^-------- code
*
* SGR 1006 mouse reporting mode:
* Almost identical to xterm mouse mode, except the values
* are decimal instead of bytes.
*
* \033[<%d;%d;%dM
* ^-- row
* ^----- column
* ^-------- code
*
* \033[<%d;%d;%dm : mouse release event
* ^-- row
* ^----- column
* ^-------- code
*/
p = modifiers_start;
if (p == NULL)
return -1;
mouse_code = getdigits(&p);
if (*p++ != ';')
return -1;
/* URXVT 1015 mouse reporting mode:
* Almost identical to xterm mouse mode, except the values
* are decimal instead of bytes.
*
* \033[%d;%d;%dM
* ^-- row
* ^----- column
* ^-------- code
*
* SGR 1006 mouse reporting mode:
* Almost identical to xterm mouse mode, except the values
* are decimal instead of bytes.
*
* \033[<%d;%d;%dM
* ^-- row
* ^----- column
* ^-------- code
*
* \033[<%d;%d;%dm : mouse release event
* ^-- row
* ^----- column
* ^-------- code
*/
p = modifiers_start;
if (p == NULL)
return -1;
/* when mouse reporting is SGR, add 32 to mouse code */
if (key_name[0] == KS_SGR_MOUSE
|| key_name[0] == KS_SGR_MOUSE_RELEASE)
mouse_code += 32;
mouse_code = getdigits(&p);
if (*p++ != ';')
return -1;
if (key_name[0] == KS_SGR_MOUSE_RELEASE)
mouse_code |= MOUSE_RELEASE;
/* when mouse reporting is SGR, add 32 to mouse code */
if (key_name[0] == KS_SGR_MOUSE
|| key_name[0] == KS_SGR_MOUSE_RELEASE)
mouse_code += 32;
mouse_col = getdigits(&p) - 1;
if (*p++ != ';')
return -1;
if (key_name[0] == KS_SGR_MOUSE_RELEASE)
mouse_code |= MOUSE_RELEASE;
mouse_row = getdigits(&p) - 1;
mouse_col = getdigits(&p) - 1;
if (*p++ != ';')
return -1;
/* The modifiers were the mouse coordinates, not the
* modifier keys (alt/shift/ctrl/meta) state. */
modifiers = 0;
mouse_row = getdigits(&p) - 1;
break;
}
/* The modifiers were the mouse coordinates, not the
* modifier keys (alt/shift/ctrl/meta) state. */
modifiers = 0;
}
# endif
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
666,
/**/
665,
/**/

0 comments on commit 5fe6912

Please sign in to comment.