[xserver,2/3] modesetting: Remove some dead code

Submitted by Hans de Goede on Aug. 16, 2016, 9:10 a.m.

Details

Message ID 1471338608-9968-2-git-send-email-hdegoede@redhat.com
State Accepted
Commit 1075af8a6c26009c04db30a6d6d1f10070568ab1
Headers show
Series "Series without cover letter" ( rev: 1 ) in X.org (DEPRECATED - USE GITLAB)

Not browsing as part of any series.

Commit Message

Hans de Goede Aug. 16, 2016, 9:10 a.m. 
The "if (pixmap) ..." block this commit removes is inside an
"if (pixmap == NULL) ..." block, so it will never execute.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 hw/xfree86/drivers/modesetting/dri2.c | 2 --
 1 file changed, 2 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
index b810d59..9bc56c2 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -186,8 +186,6 @@  ms_dri2_create_buffer(DrawablePtr drawable, unsigned int attachment,
                                       pixmap_cpp,
                                       0);
         if (pixmap == NULL) {
-            if (pixmap)
-                screen->DestroyPixmap(pixmap);
             free(private);
             free(buffer);
             return NULL;

Comments

Aaron Plattner Sept. 9, 2016, 5:22 p.m. 
On 08/16/2016 02:10 AM, Hans de Goede wrote:
> The "if (pixmap) ..." block this commit removes is inside an
> "if (pixmap == NULL) ..." block, so it will never execute.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  hw/xfree86/drivers/modesetting/dri2.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
> index b810d59..9bc56c2 100644
> --- a/hw/xfree86/drivers/modesetting/dri2.c
> +++ b/hw/xfree86/drivers/modesetting/dri2.c
> @@ -186,8 +186,6 @@ ms_dri2_create_buffer(DrawablePtr drawable, unsigned int attachment,
>                                        pixmap_cpp,
>                                        0);
>          if (pixmap == NULL) {
> -            if (pixmap)
> -                screen->DestroyPixmap(pixmap);
>              free(private);
>              free(buffer);
>              return NULL;
> 

Well this one is certainly obvious.

Reviewed-by: Aaron Plattner <aplattner@nvidia.com>