[libvirt] [PATCH] fix make syntak error
We move the macro vshStrcasecmp from tools/virsh.c to tools/virsh.h after commit c2e494cc, so we should not check strcase* in the file tools/virsh.h. Some macros are not properly indented in the file tools/virsh.h and tools/virsh-domain.h. This patch also fixes this problem. --- cfg.mk | 2 +- tools/virsh-domain.h | 2 +- tools/virsh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index e9138a8..d2e54e3 100644 --- a/cfg.mk +++ b/cfg.mk @@ -727,7 +727,7 @@ $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protoco $(MAKE) -C src remote/remote_client_bodies.h # List all syntax-check exemptions: -exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.c$$ +exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$ _src1=libvirt|fdstream|qemu/qemu_monitor|util/(command|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller exclude_file_name_regexp--sc_avoid_write = \ diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index 797462f..b1b7930 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -24,7 +24,7 @@ */ #ifndef VIRSH_DOMAIN_H -#define VIRSH_DOMAIN_H +# define VIRSH_DOMAIN_H # include "virsh.h" diff --git a/tools/virsh.h b/tools/virsh.h index 69f37cc..0b1f123 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -23,7 +23,7 @@ */ #ifndef VIRSH_H -#define VIRSH_H +# define VIRSH_H # include <stdio.h> # include <stdlib.h> -- 1.7.1
On 08/20/12 10:11, Wen Congyang wrote: in subject: s/syntak/syntax-check/
We move the macro vshStrcasecmp from tools/virsh.c to tools/virsh.h
s/move/moved/
after commit c2e494cc, so we should not check strcase* in the file tools/virsh.h.
Some macros are not properly indented in the file tools/virsh.h and tools/virsh-domain.h. This patch also fixes this problem.
--- cfg.mk | 2 +- tools/virsh-domain.h | 2 +- tools/virsh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
ACK. Peter
On 08/20/2012 02:11 AM, Wen Congyang wrote:
We move the macro vshStrcasecmp from tools/virsh.c to tools/virsh.h after commit c2e494cc, so we should not check strcase* in the file tools/virsh.h.
Some macros are not properly indented in the file tools/virsh.h and tools/virsh-domain.h. This patch also fixes this problem.
--- cfg.mk | 2 +- tools/virsh-domain.h | 2 +- tools/virsh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Phooey - I detected the problem on Saturday, but apparently while I posted the same fix, I didn't push: https://www.redhat.com/archives/libvir-list/2012-August/msg01268.html -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Mon, Aug 20, 2012 at 06:46:58AM -0600, Eric Blake wrote:
On 08/20/2012 02:11 AM, Wen Congyang wrote:
We move the macro vshStrcasecmp from tools/virsh.c to tools/virsh.h after commit c2e494cc, so we should not check strcase* in the file tools/virsh.h.
Some macros are not properly indented in the file tools/virsh.h and tools/virsh-domain.h. This patch also fixes this problem.
--- cfg.mk | 2 +- tools/virsh-domain.h | 2 +- tools/virsh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Phooey - I detected the problem on Saturday, but apparently while I posted the same fix, I didn't push: https://www.redhat.com/archives/libvir-list/2012-August/msg01268.html
I've pushed fixes for this already this morning, when I saw the build was broken. 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 :|
participants (4)
-
Daniel P. Berrange -
Eric Blake -
Peter Krempa -
Wen Congyang