[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 01/49] Fix indentions



On Thu, Aug 02, 2012 at 03:19:29PM +0800, Osier Yang wrote:
> On 2012年07月21日 00:17, Daniel P. Berrange wrote:
> >On Fri, Jul 20, 2012 at 10:15:29AM -0600, Eric Blake wrote:
> >>On 07/20/2012 08:24 AM, Osier Yang wrote:
> >>>Some of the macros use tab, while the left use spaces, this patch
> >>>change it to always use the spaces. And a few aligning fixes.
> >>>---
> >>>  src/datatypes.h |   86 +++++++++++++++++++++++++++---------------------------
> >>>  1 files changed, 43 insertions(+), 43 deletions(-)
> >>
> >>ACK.
> >>
> >>>
> >>>diff --git a/src/datatypes.h b/src/datatypes.h
> >>>index fc284d2..01a8544 100644
> >>>--- a/src/datatypes.h
> >>>+++ b/src/datatypes.h
> >>>@@ -33,8 +33,8 @@
> >>>   * magic value used to protect the API when pointers to connection structures
> >>>   * are passed down by the users.
> >>>   */
> >>>-# define VIR_CONNECT_MAGIC	0x4F23DEAD
> >>>-# define VIR_IS_CONNECT(obj)	((obj)&&  (obj)->magic==VIR_CONNECT_MAGIC)
> >>>+# define VIR_CONNECT_MAGIC   0x4F23DEAD
> >>>+# define VIR_IS_CONNECT(obj) ((obj)&&  (obj)->magic==VIR_CONNECT_MAGIC)
> >>
> >>Conflicts with Dan's series to use virObject.
> >
> >Push this patch now independantly of the rest of this huge series.
> >I'll sort out conflicts when I rebase my virObject code next week.
> >
> 
> Oh, I misunderstood you had push it, now pushed, sorry if it
> causes conflicts.

Don't worry, its not a problem.


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]