diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-21 11:47:04 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-21 11:47:04 +0100 |
| commit | ce182e88a11c3f3a3218241a6046f3aeb08aabb7 (patch) | |
| tree | 0c738dec27fdbdf055bf72caa0c96a57d6a706cf /nx-X11/programs/Xserver/hw/nxagent/Drawable.c | |
| parent | 3b640a0f8de615e53dd6801ebd2aa0cf04f76c69 (diff) | |
| parent | dc43f4c98287b283747e47e37501c5ca158a8aa6 (diff) | |
| download | nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.tar.gz nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.tar.bz2 nx-libs-ce182e88a11c3f3a3218241a6046f3aeb08aabb7.zip | |
Merge branch 'uli42-pr/simplify_free' into 3.6.x
Attributes GH PR #555: https://github.com/ArcticaProject/nx-libs/pull/555
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Drawable.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index 917f460ba..c3d27073e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -264,7 +264,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask success = 0; - goto nxagentSynchronizeDrawableDataFree; + goto nxagentSynchronizeDrawableDataEnd; } ValidateGC(pDrawable, pGC); @@ -282,7 +282,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask success = 1; - goto nxagentSynchronizeDrawableDataFree; + goto nxagentSynchronizeDrawableDataEnd; } else if (nxagentReconnectTrap == 1) { @@ -323,7 +323,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask success = 0; - goto nxagentSynchronizeDrawableDataFree; + goto nxagentSynchronizeDrawableDataEnd; } ValidateGC(pDrawable, pGC); @@ -336,7 +336,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask success = 1; - goto nxagentSynchronizeDrawableDataFree; + goto nxagentSynchronizeDrawableDataEnd; } else { @@ -349,7 +349,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask success = 1; - goto nxagentSynchronizeDrawableDataFree; + goto nxagentSynchronizeDrawableDataEnd; } } } @@ -363,14 +363,8 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask success = nxagentSynchronizeRegion(pDrawable, NullRegion, breakMask, owner); -nxagentSynchronizeDrawableDataFree: - - if (data != NULL) - { - free(data); - } - nxagentSynchronizeDrawableDataEnd: + free(data); return success; } @@ -866,10 +860,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned #endif } - if (cmpData != NULL) - { - free(cmpData); - } + free(cmpData); } } else @@ -1066,10 +1057,7 @@ nxagentSynchronizeRegionFree: nxagentFreeRegion(pDrawable, clipRegion); } - if (data != NULL) - { - free(data); - } + free(data); RegionUninit(&exposeRegion); |