libxl: poll: Make libxl__poller_get have only one success return path

In preparation for doing some more work on successful exit.

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Jim Fehlig <jfehlig@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Tested-by: Jim Fehlig <jfehlig@suse.com>
(cherry picked from commit 6fc946bc55)

(cherry picked from commit 8c409135e6)
Conflicts:
	tools/libxl/libxl_event.c
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
(cherry picked from commit 900c7970de)
This commit is contained in:
Ian Jackson authored and Ian Jackson committed 2015-08-12 12:39:36 +01:00
1 parent e9a0fc5998
commit dd80ee80c9
1 file changed
+12 -13
+12 -13
View File
@@ -1329,20 +1329,19 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx)
libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle);
if (p) {
LIBXL_LIST_REMOVE(p, entry);
return p;
}
} else {
p = malloc(sizeof(*p));
if (!p) {
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller");
return 0;
}
memset(p, 0, sizeof(*p));
p = malloc(sizeof(*p));
if (!p) {
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller");
return 0;
}
memset(p, 0, sizeof(*p));
rc = libxl__poller_init(ctx, p);
if (rc) {
free(p);
return NULL;
rc = libxl__poller_init(ctx, p);
if (rc) {
free(p);
return NULL;
}
}
return p;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.