Commit 4885e904 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Make compile warning-free on cygwin 


svn:r936
parent a5aa80cc

src/common/util.c

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ int check_private_dir(const char *dirname, int create) 
    return -1;

  }

  if (st.st_uid != getuid()) {

    log(LOG_WARN, "%s is not owned by this UID (%d)", dirname, getuid());

    log(LOG_WARN, "%s is not owned by this UID (%d)", dirname, (int)getuid());

    return -1;

  }

  if (st.st_mode & 0077) {

src/or/circuit.c

+5 −2
Original line number Diff line number Diff line
@@ -663,7 +663,9 @@ void circuit_dump_details(int severity, circuit_t *circ, int poll_index, 
      log(severity,"Building: desired len %d, planned exit node %s.",

          circ->build_state->desired_path_len, circ->build_state->chosen_exit);

    for(hop=circ->cpath;hop->next != circ->cpath; hop=hop->next)

      log(severity,"hop: state %d, addr %d, port %d", hop->state, hop->addr, hop->port);

      log(severity,"hop: state %d, addr %x, port %d", hop->state, 

          (unsigned int)hop->addr, 

          (int)hop->port);

  }

}
@@ -989,7 +991,8 @@ int circuit_finish_handshake(circuit_t *circ, char *reply) { 
  crypto_dh_free(hop->handshake_state); /* don't need it anymore */

  hop->handshake_state = NULL;



  log_fn(LOG_DEBUG,"hop %d init cipher forward %d, backward %d.", (uint32_t)hop, *(uint32_t*)keys, *(uint32_t*)(keys+16));

  log_fn(LOG_DEBUG,"hop %d init cipher forward %u, backward %u.", 

        (int)hop, (unsigned)*(uint32_t*)keys, (unsigned) *(uint32_t*)(keys+16));

  if (!(hop->f_crypto =

        crypto_create_init_cipher(CIRCUIT_CIPHER,keys,iv,1))) {

    log(LOG_WARN,"forward cipher initialization failed.");

src/or/connection_edge.c

+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ static uint32_t client_dns_lookup_entry(const char *address) 
  assert(address);



  if (inet_aton(address, &in)) {

    log_fn(LOG_DEBUG, "Using static address %s (%08X)", address, 

    log_fn(LOG_DEBUG, "Using static address %s (%08lX)", address, 

           ntohl(in.s_addr));

    return ntohl(in.s_addr);

  }

src/or/dns.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void purge_expired_resolves(uint32_t now) { 
   */

  while(oldest_cached_resolve && (oldest_cached_resolve->expire < now)) {

    resolve = oldest_cached_resolve;

    log(LOG_DEBUG,"Forgetting old cached resolve (expires %d)", resolve->expire);

    log(LOG_DEBUG,"Forgetting old cached resolve (expires %lu)", (unsigned long)resolve->expire);

    oldest_cached_resolve = resolve->next;

    if(!oldest_cached_resolve) /* if there are no more, */

      newest_cached_resolve = NULL; /* then make sure the list's tail knows that too */

src/or/router.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ int router_dump_router_to_string(char *s, int maxlen, routerinfo_t *router, 
    router->or_port,

    router->socks_port,

    router->dir_port,

    router->bandwidth,

    (int) router->bandwidth,

    platform,

    published,

    onion_pkey, link_pkey, identity_pkey);