mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
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 commit6fc946bc55) (cherry picked from commit8c409135e6) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> (cherry picked from commit900c7970de)
This commit is contained in:
1 parent
e9a0fc5998
commit
dd80ee80c9
1 file changed
+12
-13
+12
-13
@@ -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;
|
||||
|
||||