Commit f9cf5143 authored by Pavel Emelyanov's avatar Pavel Emelyanov

plugins: Don't return from inside a macro

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent a5559cbd
...@@ -47,7 +47,7 @@ struct cr_plugins cr_plugins; ...@@ -47,7 +47,7 @@ struct cr_plugins cr_plugins;
struct cr_plugin_entry *__ce; \ struct cr_plugin_entry *__ce; \
__ce = xmalloc(sizeof(struct cr_plugin_entry)); \ __ce = xmalloc(sizeof(struct cr_plugin_entry)); \
if (__ce == NULL) \ if (__ce == NULL) \
return -1; \ goto nomem; \
__ce->name = name; \ __ce->name = name; \
__ce->next = cr_plugins.name; \ __ce->next = cr_plugins.name; \
cr_plugins.name = __ce; \ cr_plugins.name = __ce; \
...@@ -128,7 +128,7 @@ static int cr_lib_load(char *path) ...@@ -128,7 +128,7 @@ static int cr_lib_load(char *path)
if (f_fini) { if (f_fini) {
ce = xmalloc(sizeof(struct cr_plugin_entry)); ce = xmalloc(sizeof(struct cr_plugin_entry));
if (ce == NULL) if (ce == NULL)
return -1; goto nomem;
ce->cr_fini = f_fini; ce->cr_fini = f_fini;
} }
...@@ -144,6 +144,9 @@ static int cr_lib_load(char *path) ...@@ -144,6 +144,9 @@ static int cr_lib_load(char *path)
} }
return 0; return 0;
nomem:
return -1;
} }
#define cr_plugin_free(name) do { \ #define cr_plugin_free(name) do { \
......
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