Various syntax-check fixes.

Make a pass over the syntax-check files, tightening up regex's,
un-ignoring certain files, and cleaning things up.

Signed-off-by: Chris Lalancette <clalance@redhat.com>

diff --git a/.x-sc_prohibit_VIR_ERR_NO_MEMORY b/.x-sc_prohibit_VIR_ERR_NO_MEMORY
index fbefbebebfda4f07f8b6cce9c5ebae2f7fd702c2..5c96e83fb1ad4904e33b2d6771aa33409e79130d 100644 (file)
--- a/.x-sc_prohibit_VIR_ERR_NO_MEMORY
+++ b/.x-sc_prohibit_VIR_ERR_NO_MEMORY
@@ -1,8 +1,5 @@
-ChangeLog
-docs/devhelp/libvirt-virterror.html
-docs/html/libvirt-virterror.html
-docs/libvirt-api.xml
-docs/libvirt-refs.xml
-include/libvirt/virterror.h
-daemon/dispatch.c
-src/util/virterror.c
+^ChangeLog$
+^ChangeLog-old$
+^include/libvirt/virterror\.h$
+^daemon/dispatch\.c$
+^src/util/virterror\.c$

diff --git a/.x-sc_prohibit_gethostby b/.x-sc_prohibit_gethostby
index c7711428e366837e3b39db0aca4f48d900cc105b..7c052f4620bd3cbb5bfb908bcfef2a5df7bd688e 100644 (file)
--- a/.x-sc_prohibit_gethostby
+++ b/.x-sc_prohibit_gethostby
@@ -1,3 +1,2 @@
-gnulib/lib/getaddrinfo.c
-gnulib/m4/
-src/xend_internal.c
+^gnulib/lib/getaddrinfo\.c$
+^gnulib/m4/

diff --git a/.x-sc_prohibit_strcmp_and_strncmp b/.x-sc_prohibit_strcmp_and_strncmp
index b7c456e8f6a24463e067e9b2d4d5c4c4c1241830..c0d87931c0e53e40400a2ad857353df12d2b1b90 100644 (file)
--- a/.x-sc_prohibit_strcmp_and_strncmp
+++ b/.x-sc_prohibit_strcmp_and_strncmp
@@ -1 +1,8 @@
 ^gnulib/
+^ChangeLog-old$
+^examples/domain-events/events-c/event-test\.c$
+^src/internal\.h$
+^src/lxc/lxc_container\.c$
+^src/node_device/node_device_devkit\.c$
+^src/node_device/node_device_hal\.c$
+^src/storage/parthelper\.c$

diff --git a/.x-sc_prohibit_strncpy b/.x-sc_prohibit_strncpy
index 10bc29c178fd384a7aa710be142bcce4c38624fe..70e23004293f2d9cbc4e7cfc7f63c9079b220ff9 100644 (file)
--- a/.x-sc_prohibit_strncpy
+++ b/.x-sc_prohibit_strncpy
@@ -1 +1 @@
-src/util/util.c
+^src/util/util\.c$

diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
index e1f6e10c30e04e79c2609fa09b7fcab9dd5a8be3..a530ae0defc6538e7393fcf8d9d84b4e53217f72 100644 (file)
--- a/.x-sc_require_config_h
+++ b/.x-sc_require_config_h
@@ -1,5 +1,4 @@
 ^examples/
 ^gnulib/lib/dummy\.c$
 ^gnulib/tests/dummy\.c$
-^daemon/remote_protocol\.c$
 ^ChangeLog$

diff --git a/Makefile.am b/Makefile.am
index 977ad0c79036b071084caa06a54d48327a7406db..14fc593c8d5c754cc5530574f99d2d33c4697e5e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,12 +17,22 @@ EXTRA_DIST = \
   mingw32-libvirt.spec.in \
   libvirt.pc libvirt.pc.in \
   autobuild.sh \
+  .x-sc_avoid_ctype_macros \
   .x-sc_avoid_if_before_free \
-  .x-sc_require_config_h_first \
+  .x-sc_avoid_write \
+  .x-sc_m4_quote_check \
+  .x-sc_prohibit_asprintf \
+  .x-sc_prohibit_gethostby \
+  .x-sc_prohibit_have_config_h \
+  .x-sc_prohibit_HAVE_MBRTOWC \
+  .x-sc_prohibit_nonreentrant \
   .x-sc_prohibit_strcmp \
   .x-sc_prohibit_strcmp_and_strncmp \
+  .x-sc_prohibit_strncpy \
+  .x-sc_prohibit_VIR_ERR_NO_MEMORY \
   .x-sc_require_config_h \
-  .x-sc_prohibit_nonreentrant \
+  .x-sc_require_config_h_first \
+  .x-sc_trailing_blank \
   Makefile.nonreentrant \
   autogen.sh \
   examples/domain-events/events-python \

diff --git a/cfg.mk b/cfg.mk
index 44cfd179335405c704eb74c4bae721bfa6ee8c6b..c1d3864fba08496e895c5dc86becde92cce7d8d4 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -79,11 +79,9 @@ sc_avoid_write:
 # Use STREQ rather than comparing strcmp == 0, or != 0.
 # Similarly, use STREQLEN or STRPREFIX rather than strncmp.
 sc_prohibit_strcmp_and_strncmp:
-       @grep -nE '! *strn?cmp *\(|\<strn?cmp *\([^)]+\) *=='           \
-           $$($(VC_LIST_EXCEPT))                                       \
-         | grep -vE ':# *define STREQ(LEN)?\(' &&                      \
-         { echo '$(ME): use STREQ(LEN) in place of the above uses of strcmp(strncmp)' \
-               1>&2; exit 1; } || :
+       @re='strn?cmp *\('                                              \
+       msg='use STREQ() in place of the above uses of str[n]cmp'       \
+         $(_prohibit_regexp)
 
 # Use virAsprintf rather than a'sprintf since *strp is undefined on error.
 sc_prohibit_asprintf: