[libvirt] [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. --- Pushing under the build-breaker rule. src/util/virfile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 8387ae9..0f88cef 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__ */ -- 1.7.10.4

On 07/09/2012 03:22 PM, Eric Blake wrote:
Commit 9612e4b2 introduced a typo and unused variable that break non-Linux builds.
* src/util/virfile.c (virFileLoopDeviceAssociate): Fix syntax error. ---
Pushing under the build-breaker rule.
Phooey, I ended up accidentally also pushing a .gnulib update; I'll back that out until automake 1.11.6/1.12.2 is more widely available (as 'make syntax-check' now breaks if you have a broken automake in your PATH). -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (1)
-
Eric Blake