[libvirt] [PATCH] maint: another preprocessor fix

Eric Blake eblake at redhat.com
Thu Apr 15 17:40:03 UTC 2010


Regression introduced in commit 62170b995.

* src/util/memory.h: Placate cppi, and fit 80 columns.
---

Pushing this as obvious, for 'make syntax-check'.

 src/util/memory.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/util/memory.h b/src/util/memory.h
index ad458a6..60e2be6 100644
--- a/src/util/memory.h
+++ b/src/util/memory.h
@@ -1,6 +1,7 @@
 /*
  * memory.c: safer memory allocation
  *
+ * Copyright (C) 2010 Red Hat, Inc.
  * Copyright (C) 2008 Daniel P. Berrange
  *
  * This library is free software; you can redistribute it and/or
@@ -102,7 +103,7 @@ void virFree(void *ptrptr);
  * arithmetic overflow in the allocation size.  The check is
  * essentially the same as that in gnulib's xalloc_oversized.
  */
-#define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N))
+# define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N))

 /**
  * VIR_ALLOC_VAR:
@@ -121,7 +122,8 @@ void virFree(void *ptrptr);

  * Returns -1 on failure, 0 on success
  */
-#define VIR_ALLOC_VAR(ptr, type, count) virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count))
+# define VIR_ALLOC_VAR(ptr, type, count) \
+    virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count))

 /**
  * VIR_FREE:
-- 
1.6.6.1




More information about the libvir-list mailing list