diff options
| -rw-r--r-- | src/common/tortls.c | 1 | ||||
| -rw-r--r-- | src/common/util.h | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index dafbbee6d..b9f3dbab3 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -467,7 +467,6 @@ tor_tls_get_peer_cert_nickname(tor_tls *tls, char *buf, int buflen) X509_NAME *name = NULL; int nid; int lenout; - int i; if (!(cert = SSL_get_peer_certificate(tls->ssl))) { log_fn(LOG_WARN, "Peer has no certificate"); diff --git a/src/common/util.h b/src/common/util.h index 01087df87..3df098c68 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -32,18 +32,16 @@ #define INLINE inline #endif -#define xfree(p) do {if(p) {free(p); (p)=NULL;}} while(0) /* XXX use everywhere? */ void *tor_malloc(size_t size); void *tor_realloc(void *ptr, size_t size); char *tor_strdup(const char *s); -void tor_gettimeofday(struct timeval *timeval); +#define tor_free(p) do {if(p) {free(p); (p)=NULL;}} while(0) +void tor_gettimeofday(struct timeval *timeval); long tv_udiff(struct timeval *start, struct timeval *end); - void tv_addms(struct timeval *a, long ms); void tv_add(struct timeval *a, struct timeval *b); int tv_cmp(struct timeval *a, struct timeval *b); - time_t tor_timegm (struct tm *tm); int write_all(int fd, const char *buf, size_t count); |