[libvirt] [PATCH] nodeinfo: remove superflous braces

that break compilation on non intel architectures: mips: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=mips&ver=0.9.2-1&stamp=1307570195 powerpc: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=powerpc&ver=0.9.2-1&stamp=1307550913 s390: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=s390&ver=0.9.2-1&stamp=1307641748 sparc: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=sparc&ver=0.9.2-1&stamp=1307552926 O.k. to apply? Cheers, -- Guido --- src/nodeinfo.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index f55c83e..1fe6ec9 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -248,7 +248,6 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, && (*p == '\0' || c_isspace(*p)) && id > nodeinfo->cores) nodeinfo->cores = id; - } # elif defined(__powerpc__) || \ defined(__powerpc64__) } else if (STRPREFIX(buf, "clock")) { @@ -266,7 +265,6 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, /* Accept trailing fractional part. */ && (*p == '\0' || *p == '.' || c_isspace(*p))) nodeinfo->mhz = ui; - } # elif defined(__s390__) || \ defined(__s390x__) } else if (STRPREFIX(buf, "# processors")) { @@ -289,10 +287,10 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, * and parsed in next iteration, because it is not in expected * format and thus lead to error. */ break; - } # else # warning Parser for /proc/cpuinfo needs to be adapted for your architecture # endif + } } if (!nodeinfo->cpus) { -- 1.7.5.3

s/superflous/superfluous/ On 06/11/2011 10:18 AM, Guido Günther wrote:
that break compilation on non intel architectures:
mips: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=mips&ver=0.9.2-1&stamp=1307570195 powerpc: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=powerpc&ver=0.9.2-1&stamp=1307550913 s390: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=s390&ver=0.9.2-1&stamp=1307641748 sparc: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=sparc&ver=0.9.2-1&stamp=1307552926
O.k. to apply? Cheers, -- Guido
--- src/nodeinfo.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
ACK, with spelling nit in subject. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

On Mon, Jun 13, 2011 at 04:22:56PM -0600, Eric Blake wrote:
s/superflous/superfluous/
On 06/11/2011 10:18 AM, Guido Günther wrote:
that break compilation on non intel architectures:
mips: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=mips&ver=0.9.2-1&stamp=1307570195 powerpc: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=powerpc&ver=0.9.2-1&stamp=1307550913 s390: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=s390&ver=0.9.2-1&stamp=1307641748 sparc: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=sparc&ver=0.9.2-1&stamp=1307552926
O.k. to apply? Cheers, -- Guido
--- src/nodeinfo.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
ACK, with spelling nit in subject. Pushed. Thanks. Cheers, -- Guido
participants (2)
-
Eric Blake
-
Guido Günther