From: Ralph Giles <giles@xiph.org>
Date: Tue, 8 Mar 2011 15:14:12 +0000 (-0800)
Subject: Fix a multi-line format-string warning.
X-Git-Tag: v0.9.7~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6948bf0f975fdb55a2427e798ba449a02f4f131;p=libvpx

Fix a multi-line format-string warning.

GCC 4.5 and 4.6 both issue a warning about the multi-line format
string introduced in bc9c30a0, which also changed the whitespace
in the associated stt file by line-wrapping the long format string.

Instead, use multiple string constants, which the compiler will
concatenate. This maintains the original formatting, but remains
legible within the standard line length.

Change-Id: I27c9f92d46be82d408105a3a4091f145f677e00e
---

diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c
index b5470f8f6..d2cc8482e 100644
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -312,9 +312,9 @@ void vp8_output_stats(const VP8_COMP            *cpi,
         FILE *fpfile;
         fpfile = fopen("firstpass.stt", "a");
 
-        fprintf(fpfile, "%12.0f %12.0f %12.0f %12.4f %12.4f %12.4f %12.4f
-                %12.4f %12.4f %12.4f %12.4f %12.4f %12.4f %12.4f %12.0f
-                %12.4f\n",
+        fprintf(fpfile, "%12.0f %12.0f %12.0f %12.4f %12.4f %12.4f %12.4f"
+                " %12.4f %12.4f %12.4f %12.4f %12.4f %12.4f %12.4f %12.0f"
+                " %12.4f\n",
                 stats->frame,
                 stats->intra_error,
                 stats->coded_error,