[libvirt] [PATCH] util: Re-format literal strings in virXMLEmitWarning
And drop a stray space at the end of the first line of the warning. --- Yes, some lines exceed 80 columns. --- src/util/xml.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/util/xml.c b/src/util/xml.c index dad9227..30323b3 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -796,13 +796,15 @@ static int virXMLEmitWarning(int fd, const char *cmd) { size_t len; - const char *prologue = "<!--\n\ -WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE \n\ -OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n\ - virsh "; - const char *epilogue = "\n\ -or other application using the libvirt API.\n\ --->\n\n"; + const char *prologue = + "<!--\n" + "WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE\n" + "OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n" + " virsh "; + const char *epilogue = + "\n" + "or other application using the libvirt API.\n" + "-->\n\n"; if (fd < 0 || !cmd) { errno = EINVAL; -- 1.7.12.4
On Mon, Oct 29, 2012 at 03:22:05PM +0100, Peter Krempa wrote:
And drop a stray space at the end of the first line of the warning. --- Yes, some lines exceed 80 columns. --- src/util/xml.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/util/xml.c b/src/util/xml.c index dad9227..30323b3 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -796,13 +796,15 @@ static int virXMLEmitWarning(int fd, const char *cmd) { size_t len; - const char *prologue = "<!--\n\ -WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE \n\ -OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n\ - virsh "; - const char *epilogue = "\n\ -or other application using the libvirt API.\n\ --->\n\n"; + const char *prologue = + "<!--\n" + "WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE\n" + "OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n" + " virsh "; + const char *epilogue = + "\n" + "or other application using the libvirt API.\n" + "-->\n\n";
ACK 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 :|
On 10/29/12 15:23, Daniel P. Berrange wrote:
On Mon, Oct 29, 2012 at 03:22:05PM +0100, Peter Krempa wrote:
And drop a stray space at the end of the first line of the warning. --- Yes, some lines exceed 80 columns. --- src/util/xml.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
Thanks, pushed. Peter
participants (2)
-
Daniel P. Berrange -
Peter Krempa