Re: [PATCH 5/5] hw/display/artist: Remove dead code (CID 1419388 & 1419389)

[Sven Schnelle]

On Fri, Feb 14, 2020 at 01:13:02AM +0100, Philippe Mathieu-Daudé wrote:
> Coverity reports:
> 
>   *** CID 1419388:  Control flow issues  (DEADCODE)
>   /hw/display/artist.c: 739 in draw_line_xy()
>   733         if (endy < 0) {
>   734             endy = 0;
>   735         }
>   736
>   737
>   738         if (endx < 0) {
>   >>>     CID 1419388:  Control flow issues  (DEADCODE)
>   >>>     Execution cannot reach this statement: "return;".
>   739             return;
>   740         }
>   741
>   742         if (endy < 0) {
>   743             return;
>   744         }
> 
>   *** CID 1419389:  Control flow issues  (DEADCODE)
>   /hw/display/artist.c: 743 in draw_line_xy()
>   737
>   738         if (endx < 0) {
>   739             return;
>   740         }
>   741
>   742         if (endy < 0) {
>   >>>     CID 1419389:  Control flow issues  (DEADCODE)
>   >>>     Execution cannot reach this statement: "return;".
>   743             return;
>   744         }
>   745
>   746         trace_artist_draw_line(startx, starty, endx, endy);
>   747         draw_line(s, startx, starty, endx, endy, false, -1, -1);
>   748     }
> 
> Fixes: Covertiy CID 1419388 and 1419389 (commit 4765384ce33)
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
>  hw/display/artist.c | 9 ---------
>  1 file changed, 9 deletions(-)
> 
> diff --git a/hw/display/artist.c b/hw/display/artist.c
> index 5492079116..753dbb9a77 100644
> --- a/hw/display/artist.c
> +++ b/hw/display/artist.c
> @@ -690,59 +690,50 @@ static void draw_line_size(ARTISTState *s, bool 
> update_start)
>  static void draw_line_xy(ARTISTState *s, bool update_start)
>  {
>  
>      int startx = artist_get_x(s->vram_start);
>      int starty = artist_get_y(s->vram_start);
>      int sizex = artist_get_x(s->blockmove_size);
>      int sizey = artist_get_y(s->blockmove_size);
>      int linexy = s->line_xy >> 16;
>      int endx, endy;
>  
>      endx = startx;
>      endy = starty;
>  
>      if (sizex > 0) {
>          endx = startx + linexy;
>      }
>  
>      if (sizex < 0) {
>          endx = startx;
>          startx -= linexy;
>      }
>  
>      if (sizey > 0) {
>          endy = starty + linexy;
>      }
>  
>      if (sizey < 0) {
>          endy = starty;
>          starty -= linexy;
>      }
>  
>      if (startx < 0) {
>          startx = 0;
>      }
>  
>      if (endx < 0) {
>          endx = 0;
>      }
>  
>      if (starty < 0) {
>          starty = 0;
>      }
>  
>      if (endy < 0) {
>          endy = 0;
>      }
>  
> -
> -    if (endx < 0) {
> -        return;
> -    }
> -
> -    if (endy < 0) {
> -        return;
> -    }
> -
>      draw_line(s, startx, starty, endx, endy, false, -1, -1);
>  }
>  
> -- 
> 2.21.1
> 

Acked-by: Sven Schnelle <address@hidden>