commit 6161bb51a042e5ab6b3f4bdf929258307b86e759 Author: Zack Weinberg zackw@cmu.edu Date: Sat Jun 2 14:09:54 2012 -0700

Fix compile errors with gcc 4.7 --- src/steg/jsSteg.cc | 2 +- src/test/tinytest_macros.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/steg/jsSteg.cc b/src/steg/jsSteg.cc index 6ff0b89..dbe4431 100644 --- a/src/steg/jsSteg.cc +++ b/src/steg/jsSteg.cc @@ -351,7 +351,7 @@ int encodeHTTPBody(char *data, char *jTemplate, char *jData, char *jsStart, *jsEnd; int skip; int scriptLen; - int fin; + int fin = 0; unsigned int dlen2 = dlen; dp = data; jtp = jTemplate; diff --git a/src/test/tinytest_macros.h b/src/test/tinytest_macros.h index 00d8732..5dd2742 100644 --- a/src/test/tinytest_macros.h +++ b/src/test/tinytest_macros.h @@ -112,7 +112,7 @@ setup_block; \ _print2 = _print; \ TT_DECLARE(_tt_status?" OK":"FAIL", \ - ("assert(%s): "printf_fmt" vs "printf_fmt, \ + ("assert(%s): " printf_fmt " vs " printf_fmt,\ str_test, _print1, _print2)); \ _print = _print1; \ cleanup_block; \