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

[libvirt] fix two "make syntax-check" failures



Mark McLoughlin pointed out this failure:

    ChangeLog-old: if (foo) free (foo)
    ChangeLog-old: if (foo != NULL) free (foo)
    maint.mk: found useless "if" before "free" above
    make: *** [sc_avoid_if_before_free] Error 1

Here's the other:

--- po/POTFILES.in
+++ po/POTFILES.in
@@ -1,3 +1,4 @@
+cfg.mk
 qemud/qemud.c
 qemud/remote.c
 src/bridge.c
maint.mk: you have changed the set of files with translatable diagnostics;
 apply the above patch

I had fixed the latter in gnulib (now that main.mk comes
from there), but had forgotten to tell libvirt to use
the latest version of gnulib, in order to get that fix.
To do that, I ran "git syncsub" (where syncsub is an alias:
syncsub = submodule foreach git pull origin master)
then git commit -a.

Here are the two patches I'm about to push:

>From bcf2aed1a91e66fee823e9063050c14bfc4ca29d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Thu, 9 Jul 2009 20:00:37 +0200
Subject: [PATCH 1/2] avoid a "make syntax-check" failure

* .x-sc_avoid_if_before_free: Ignore *all* ChangeLog files,
now, including ChangeLog-old.
---
 .x-sc_avoid_if_before_free |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/.x-sc_avoid_if_before_free b/.x-sc_avoid_if_before_free
index 5093ef6..7e6ce62 100644
--- a/.x-sc_avoid_if_before_free
+++ b/.x-sc_avoid_if_before_free
@@ -1,5 +1 @@
-^gnulib/lib/getaddrinfo\.c$
-^gnulib/lib/printf-parse\.c$
-^gnulib/lib/vasnprintf\.c$
-^build-aux/useless-if-before-free$
-^ChangeLog$
+^ChangeLog
--
1.6.3.3.524.g8586b


>From 72978b978991f106dc0e36b10a942d9040a1df00 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Thu, 9 Jul 2009 20:02:31 +0200
Subject: [PATCH 2/2] build: update from gnulib, for latest maint.mk

* gnulib: Update submodule to latest.
This fixes the make syntax-check failure whereby sc_po_check
would complain about cfg.mk.
---
 .gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.gnulib b/.gnulib
index 1203e8d..b653eda 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 1203e8d1f62dec3d2436dffadd5c20793cf84366
+Subproject commit b653eda3ac4864de205419d9f41eec267cb89eeb
--
1.6.3.3.524.g8586b


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