From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 1/9] libxl: poll: Make libxl__poller_get have only one success return path Date: Thu, 9 Jul 2015 18:47:49 +0100 Message-ID: <1436464077-2752-2-git-send-email-ian.jackson@eu.citrix.com> References: <1436464077-2752-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1436464077-2752-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: Wei Liu , Jim Fehlig , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org In preparation for doing some more work on successful exit. No functional change. Signed-off-by: Ian Jackson CC: Jim Fehlig --- tools/libxl/libxl_event.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 9072df4..b332dd7 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1627,15 +1627,14 @@ libxl__poller *libxl__poller_get(libxl__gc *gc) libxl__poller *p = LIBXL_LIST_FIRST(&CTX->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); - return p; - } - - p = libxl__zalloc(NOGC, sizeof(*p)); + } else { + p = libxl__zalloc(NOGC, sizeof(*p)); - rc = libxl__poller_init(gc, p); - if (rc) { - free(p); - return NULL; + rc = libxl__poller_init(gc, p); + if (rc) { + free(p); + return NULL; + } } return p; -- 1.7.10.4