[PATCH] virNetDevOpenvswitchUpdateVlan: Use space for indentation

Peter Krempa posted 1 patch 2 years, 2 months ago
Failed in applying to current master (apply log)
src/util/virnetdevopenvswitch.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] virNetDevOpenvswitchUpdateVlan: Use space for indentation
Posted by Peter Krempa 2 years, 2 months ago
Breaks syntax-check:

TAB_in_indentation
/home/pipo/libvirt/src/util/virnetdevopenvswitch.c:610:	if (virtVlan && virtVlan->nTags > 0)
/home/pipo/libvirt/src/util/virnetdevopenvswitch.c:611:		virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
make: Leaving directory '/home/pipo/build/libvirt/gcc/build-aux'

Fixes: 21c55a45efab47f2c8edc25d4fcabc1b99b6628c
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
Pushed as a build fix.

 src/util/virnetdevopenvswitch.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index 227c04077d..7418716600 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -607,8 +607,8 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
                          "--", "--if-exists", "clear", "Port", ifname, "trunk",
                          "--", "--if-exists", "clear", "Port", ifname, "vlan_mode", NULL);

-	if (virtVlan && virtVlan->nTags > 0)
-		virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
+    if (virtVlan && virtVlan->nTags > 0)
+        virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);

     virNetDevOpenvswitchConstructVlans(cmd, virtVlan);

-- 
2.34.1

Re: [PATCH] virNetDevOpenvswitchUpdateVlan: Use space for indentation
Posted by Michal Prívozník 2 years, 2 months ago
On 2/10/22 13:11, Peter Krempa wrote:
> Breaks syntax-check:
> 
> TAB_in_indentation
> /home/pipo/libvirt/src/util/virnetdevopenvswitch.c:610:	if (virtVlan && virtVlan->nTags > 0)
> /home/pipo/libvirt/src/util/virnetdevopenvswitch.c:611:		virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
> make: Leaving directory '/home/pipo/build/libvirt/gcc/build-aux'
> 
> Fixes: 21c55a45efab47f2c8edc25d4fcabc1b99b6628c
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
> Pushed as a build fix.
> 
>  src/util/virnetdevopenvswitch.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
> index 227c04077d..7418716600 100644
> --- a/src/util/virnetdevopenvswitch.c
> +++ b/src/util/virnetdevopenvswitch.c
> @@ -607,8 +607,8 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
>                           "--", "--if-exists", "clear", "Port", ifname, "trunk",
>                           "--", "--if-exists", "clear", "Port", ifname, "vlan_mode", NULL);
> 
> -	if (virtVlan && virtVlan->nTags > 0)
> -		virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
> +    if (virtVlan && virtVlan->nTags > 0)
> +        virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
> 
>      virNetDevOpenvswitchConstructVlans(cmd, virtVlan);
> 

Oops, I forgot to squash that in. I did catch it locally, but failed to
fix the commit. Sorry.

Michal

Re: [PATCH] virNetDevOpenvswitchUpdateVlan: Use space for indentation
Posted by Ján Tomko 2 years, 2 months ago
On a Thursday in 2022, Peter Krempa wrote:
>Breaks syntax-check:
>
>TAB_in_indentation
>/home/pipo/libvirt/src/util/virnetdevopenvswitch.c:610:	if (virtVlan && virtVlan->nTags > 0)
>/home/pipo/libvirt/src/util/virnetdevopenvswitch.c:611:		virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
>make: Leaving directory '/home/pipo/build/libvirt/gcc/build-aux'
>
>Fixes: 21c55a45efab47f2c8edc25d4fcabc1b99b6628c
>Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>---
>Pushed as a build fix.
>
> src/util/virnetdevopenvswitch.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano