[Libguestfs] [PATCH v3 4/4] lib, p2v: Use single_element() macro where possible.

[Richard W.M. Jones]

On Fri, Nov 02, 2018 at 05:15:47PM +0100, Pino Toscano wrote:
> On Friday, 2 November 2018 16:05:04 CET Richard W.M. Jones wrote:
> > diff --git a/common/utils/libxml2-writer-macros.h b/common/utils/libxml2-writer-macros.h
> > index d74dcd465..a99b245bb 100644
> > --- a/common/utils/libxml2-writer-macros.h
> > +++ b/common/utils/libxml2-writer-macros.h
> > @@ -86,7 +86,7 @@
> >   *
> >   * which produces C<<< <name>text</name> >>>
> >   */
> > -#define single_element(element, str)            \
> > +#define single_element(element,str)             \
> >    do {                                          \
> >      start_element ((element)) {                 \
> >        string ((str));                           \
> 
> This fits better as squashed in patch #3.

Oops, yes, consequence of rebasing :-)

> > -      if (params->data->uefi_vars) {
> > -	start_element ("nvram") {
> > -	  string (params->data->uefi_vars);
> > -	} end_element ();
> > -      }
> > +      if (params->data->uefi_vars)
> > +	single_element ("nvram", params->data->uefi_vars);
> 
> Hm indented with tab?

We're using tabs elsewhere in the same file so I guess it's OK.  When
viewed without the prefix it looks fine, although as you say it is
using a tab whereas the previous line uses 6 spaces.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW