[tor-commits] [stegotorus/master] Fix a typo in configure.ac and a %d/%lu error in embed.cc.

[zwol at torproject.org]

commit 03aff0a19532893d417c6b99f6c4a7170eec6bcd
Author: Zack Weinberg <zackw at cmu.edu>
Date:   Tue Dec 6 22:12:49 2011 +0000

    Fix a typo in configure.ac and a %d/%lu error in embed.cc.
    
    git-svn-id: svn+ssh://spartan.csl.sri.com/svn/private/DEFIANCE@176 a58ff0ac-194c-e011-a152-003048836090
---
 configure.ac      |    2 +-
 src/steg/embed.cc |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5a7650b..ca76a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ PKG_CHECK_MODULES([libevent], [libevent >= 2.0])
 PKG_CHECK_MODULES([libz], [zlib >= 1.2.3.4])
 
 LIBS="$libevent_LIBS $libcryptopp_LIBS $libz_LIBS"
-lib_CPPFLAGS="$libevent_CFLAGS $libcryptopp_CFLAGS $libz_LIBS"
+lib_CPPFLAGS="$libevent_CFLAGS $libcryptopp_CFLAGS $libz_CFLAGS"
 AC_SUBST(lib_CPPFLAGS)
 
 # ntohl and a bunch of related functions require a special library on Windows.
diff --git a/src/steg/embed.cc b/src/steg/embed.cc
index 1e13851..d887ea7 100644
--- a/src/steg/embed.cc
+++ b/src/steg/embed.cc
@@ -109,8 +109,9 @@ bool embed::detect(conn_t *conn) {
 
   struct evbuffer *source = conn_get_inbound(conn);
   size_t src_len = evbuffer_get_length(source);
-  
-  log_debug("detecting buffer of length %d", src_len);
+
+  log_debug("detecting buffer of length %lu",
+            (unsigned long)src_len);
 
   int cur_idx;
   if (evbuffer_copyout(source, &cur_idx, 4) != 4) return 0;