Commit aa536031 authored by Ken Thomases's avatar Ken Thomases Committed by Alexandre Julliard

winemac: Reduce duplicated code by consolidating exit paths from format_for_type().

parent 7c0c30b4
...@@ -361,10 +361,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty ...@@ -361,10 +361,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty
{ {
format = LIST_ENTRY(ptr, WINE_CLIPFORMAT, entry); format = LIST_ENTRY(ptr, WINE_CLIPFORMAT, entry);
if (CFEqual(format->type, type)) if (CFEqual(format->type, type))
{ goto done;
TRACE(" -> %p/%s\n", format, debugstr_format(format->format_id));
return format;
}
} }
format = NULL; format = NULL;
...@@ -376,7 +373,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty ...@@ -376,7 +373,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty
{ {
ERR("Shouldn't happen. Built-in type %s should have matched something in format list.\n", ERR("Shouldn't happen. Built-in type %s should have matched something in format list.\n",
debugstr_cf(type)); debugstr_cf(type));
return NULL; goto done;
} }
else if (CFStringHasPrefix(type, registered_name_type_prefix)) else if (CFStringHasPrefix(type, registered_name_type_prefix))
{ {
...@@ -403,6 +400,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty ...@@ -403,6 +400,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty
HeapFree(GetProcessHeap(), 0, name); HeapFree(GetProcessHeap(), 0, name);
} }
done:
TRACE(" -> %p/%s\n", format, debugstr_format(format ? format->format_id : 0)); TRACE(" -> %p/%s\n", format, debugstr_format(format ? format->format_id : 0));
return format; return format;
} }
......
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