Merge pull request #2097 from mikemccracken/2018-01-19/report-storage-destroy

storage: treat return value from ops->destroy as int

Merge pull request #2097 from mikemccracken/2018-01-19/report-storage-destroy
95220ee6 · Christian Brauner · GitHub · e6dba512 · ed05aac8 · 95220ee6
Unverified Commit 95220ee6 authored Jan 20, 2018 by Christian Brauner Committed by GitHub Jan 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

storage.c src/lxc/storage/storage.c +3 -2

No files found.
--- a/src/lxc/storage/storage.c
+++ b/src/lxc/storage/storage.c
@@ -603,13 +603,14 @@ bool storage_destroy(struct lxc_conf *conf)
 {
 	struct lxc_storage *r;
 	bool ret = false;
+	int destroy_rv = 0;

 	r = storage_init(conf);
 	if (!r)
 		return ret;

-	ret = r->ops->destroy(r);
-	if (ret == 0)
+	destroy_rv = r->ops->destroy(r);
+	if (destroy_rv == 0)
 		ret = true;

 	storage_put(r);