From 17b17565e6464e6219866ffea74e1af310a45195 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 7 Apr 2014 17:25:49 +0200 Subject: [PATCH] Simplify bhyveDriverGetCapabilities() The driver passed as the only argument to the function should never be NULL so there's no need to check it. After removing it, the whole function collapses to a single line doing ref over driver capabilities. Signed-off-by: Michal Privoznik --- src/bhyve/bhyve_driver.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 84d1915b92..6ef9d98656 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -2,6 +2,7 @@ * bhyve_driver.c: core driver methods for managing bhyve guests * * Copyright (C) 2014 Roman Bogorodskiy + * Copyright (C) 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -123,16 +124,10 @@ bhyveAutostartDomains(bhyveConnPtr driver) * Returns: a reference to a virCapsPtr instance or NULL */ static virCapsPtr -bhyveDriverGetCapabilities(bhyveConnPtr driver) +bhyveDriverGetCapabilities(bhyveConnPtr driver ATTRIBUTE_NONNULL) { - virCapsPtr ret = NULL; - if (driver == NULL) - return NULL; - - ret = virObjectRef(driver->caps); - - return ret; + return virObjectRef(driver->caps); } static char * -- GitLab