]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
build: fix typo that breaks non-Linux builds
authorEric Blake <eblake@redhat.com>
Mon, 9 Jul 2012 21:21:10 +0000 (15:21 -0600)
committerEric Blake <eblake@redhat.com>
Mon, 9 Jul 2012 21:50:59 +0000 (15:50 -0600)
Commit 9612e4b2 introduced a typo and unused variable that break
non-Linux builds.

* src/util/virfile.c (virFileLoopDeviceAssociate): Fix syntax error.

.gnulib
src/util/virfile.c

diff --git a/.gnulib b/.gnulib
index a02ba4bf889fee4622db87f185c3d0af84d74ae7..48fe477c9008efadab8cf8c0c3240d824c12a8b9 160000 (submodule)
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit a02ba4bf889fee4622db87f185c3d0af84d74ae7
+Subproject commit 48fe477c9008efadab8cf8c0c3240d824c12a8b9
index 8387ae952889bd401efe39cfaea30005d565ce94..0f88cef09d197e9f53e6322ce760489c4e85d1e3 100644 (file)
@@ -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__ */