External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

virbuffer: fix build on rhel-6

Browse Source 
On rhel-6 is broken gcc that reports this warning:

util/virbuffer.c:500: error: logical '&&' with non-zero constant will
    always evaluate as true [-Wlogical-op]

Move the pragma directive before function virBufferEscapeString because
since commit aeb5262e this function uses 'strchr' too.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2015-04-16 18:32:26 +02:00
parent 0cf87b51d4
commit 358dbf8457
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/virbuffer.c
View File

@ -421,6 +421,15 @@ virBufferVasprintf(virBufferPtr buf, const char *format, va_list argptr)
buf->use += count;
}
/* Work around spurious strchr() diagnostics given by -Wlogical-op
* for gcc < 4.6. Doing it via a local pragma keeps the damage
* smaller than disabling it on the package level. Unfortunately, the
* affected GCCs don't allow diagnostic push/pop which would have
* further reduced the impact. */
#if BROKEN_GCC_WLOGICALOP
# pragma GCC diagnostic ignored "-Wlogical-op"
#endif
/**
* virBufferEscapeString:
* @buf: the buffer to append to
@ -535,15 +544,6 @@ virBufferEscapeSexpr(virBufferPtr buf,
virBufferEscape(buf, '\\', "\\'", format, str);
}
/* Work around spurious strchr() diagnostics given by -Wlogical-op
* for gcc < 4.6. Doing it via a local pragma keeps the damage
* smaller than disabling it on the package level. Unfortunately, the
* affected GCCs don't allow diagnostic push/pop which would have
* further reduced the impact. */
#if BROKEN_GCC_WLOGICALOP
# pragma GCC diagnostic ignored "-Wlogical-op"
#endif
/**
* virBufferEscape:
* @buf: the buffer to append to