introduce new tor_free() macro

svn:r643

diff --git a/src/common/tortls.c b/src/common/tortls.c
index dafbbee6daa0b8d71ee32be90558c1ccd30069d7..b9f3dbab3809432e9bc6f69168ab4d954a2427cd 100644 (file)
--- 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 01087df87d8e3842564908411da584a38793abbf..3df098c68454272fd5456f9afd9e44c9d124c1b9 100644 (file)
--- 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);