[tor-commits] [tor/release-0.2.2] Standardize our printf code on %d, not %i.

[arma at torproject.org]

commit 5cc322e5472996fda6095e54de302c0f5c68ea92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 19 12:40:26 2011 -0400

    Standardize our printf code on %d, not %i.
---
 src/common/address.c |    2 +-
 src/or/routerparse.c |    4 ++--
 src/test/test_addr.c |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/address.c b/src/common/address.c
index adc0ef0..aff517c 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -604,7 +604,7 @@ tor_addr_parse_mask_ports(const char *s, tor_addr_t *addr_out,
       if (family == AF_INET6 && v4map) {
         if (bits > 32 && bits < 96) { /* Crazy */
           log_warn(LD_GENERAL,
-                   "Bad mask bits %i for V4-mapped V6 address; rejecting.",
+                   "Bad mask bits %d for V4-mapped V6 address; rejecting.",
                    bits);
           goto err;
         }
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index dd72eb6..ba29f05 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -4641,8 +4641,8 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out,
   if (eos-desc > REND_DESC_MAX_SIZE) {
     /* XXX023 If we are parsing this descriptor as a server, this
      * should be a protocol warning. */
-    log_warn(LD_REND, "Descriptor length is %i which exceeds "
-             "maximum rendezvous descriptor size of %i bytes.",
+    log_warn(LD_REND, "Descriptor length is %d which exceeds "
+             "maximum rendezvous descriptor size of %d bytes.",
              (int)(eos-desc), REND_DESC_MAX_SIZE);
     goto err;
   }
diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index 20ffaa0..6db4ee2 100644
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@ -477,9 +477,9 @@ test_addr_ip6_helpers(void)
   i = get_interface_address6(LOG_DEBUG, AF_INET6, &t2);
 #if 0
   tor_inet_ntop(AF_INET, &t1.sa.sin_addr, buf, sizeof(buf));
-  printf("\nv4 address: %s  (family=%i)", buf, IN_FAMILY(&t1));
+  printf("\nv4 address: %s  (family=%d)", buf, IN_FAMILY(&t1));
   tor_inet_ntop(AF_INET6, &t2.sa6.sin6_addr, buf, sizeof(buf));
-  printf("\nv6 address: %s  (family=%i)", buf, IN_FAMILY(&t2));
+  printf("\nv6 address: %s  (family=%d)", buf, IN_FAMILY(&t2));
 #endif
 
  done: