Browse Source

introduce new tor_free() macro

svn:r643
Roger Dingledine 20 years ago
parent
commit
069227db5b
2 changed files with 2 additions and 5 deletions
  1. 0 1
      src/common/tortls.c
  2. 2 4
      src/common/util.h

+ 0 - 1
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");

+ 2 - 4
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);