From 56f34e5573fdb448e54e62c6ae23df29038dfddb Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 9 Jul 2012 15:21:10 -0600 Subject: [PATCH] build: fix typo that breaks non-Linux builds Commit 9612e4b2 introduced a typo and unused variable that break non-Linux builds. * src/util/virfile.c (virFileLoopDeviceAssociate): Fix syntax error. --- .gnulib | 2 +- src/util/virfile.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index a02ba4bf8..48fe477c9 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit a02ba4bf889fee4622db87f185c3d0af84d74ae7 +Subproject commit 48fe477c9008efadab8cf8c0c3240d824c12a8b9 diff --git a/src/util/virfile.c b/src/util/virfile.c index 8387ae952..0f88cef09 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1,7 +1,7 @@ /* * virfile.c: safer file handling * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2010 IBM Corporation * Copyright (C) 2010 Stefan Berger * Copyright (C) 2010 Eric Blake @@ -627,7 +627,8 @@ int virFileLoopDeviceAssociate(const char *file, virReportSystemError(ENOSYS, _("Unable to associate file %s with loop device"), file); - return -1;m + *dev = NULL; + return -1; } #endif /* __linux__ */ -- 2.39.5