Skip to content

N
nx-libs
Commit cc8d8f72 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Drawable.c: get rid of goto code in nxagentSynchronizeDrawableData

Now all cleanup code at the end of the function is gone so there's no need for the gotos anymore. Just return directly.
parent beef0cd9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 16 deletions
nx-X11/programs/Xserver/hw/nxagent/Drawable.c
View file @ cc8d8f72
...@@ -245,8 +245,6 @@ static int reallySynchronizeDrawableData(DrawablePtr pDrawable) ...@@ -245,8 +245,6 @@ static int reallySynchronizeDrawableData(DrawablePtr pDrawable)
int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask, WindowPtr owner) int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask, WindowPtr owner)
{ {
int success;
if (pDrawable -> type == DRAWABLE_PIXMAP) if (pDrawable -> type == DRAWABLE_PIXMAP)
{ {
/* /*
...@@ -261,9 +259,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask ...@@ -261,9 +259,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
__func__, (void *) pDrawable); __func__, (void *) pDrawable);
#endif #endif
success = reallySynchronizeDrawableData(pDrawable); return reallySynchronizeDrawableData(pDrawable);
goto nxagentSynchronizeDrawableDataEnd;
} }
else if (nxagentReconnectTrap == 1) else if (nxagentReconnectTrap == 1)
{ {
...@@ -291,9 +287,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask ...@@ -291,9 +287,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
} }
#endif #endif
success = reallySynchronizeDrawableData(pDrawable); return reallySynchronizeDrawableData(pDrawable);
goto nxagentSynchronizeDrawableDataEnd;
} }
else else
{ {
...@@ -304,9 +298,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask ...@@ -304,9 +298,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
nxagentMarkCorruptedRegion(pDrawable, NullRegion); nxagentMarkCorruptedRegion(pDrawable, NullRegion);
success = 1; return 1;
goto nxagentSynchronizeDrawableDataEnd;
} }
} }
} }
...@@ -317,11 +309,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask ...@@ -317,11 +309,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
* the drawable. * the drawable.
*/ */
success = nxagentSynchronizeRegion(pDrawable, NullRegion, breakMask, owner); return nxagentSynchronizeRegion(pDrawable, NullRegion, breakMask, owner);
nxagentSynchronizeDrawableDataEnd:
return success;
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment