diff options
author | Roger Dingledine <arma@torproject.org> | 2003-10-04 01:36:11 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2003-10-04 01:36:11 +0000 |
commit | 750b238aea995f3a474580bb62892714bea662bc (patch) | |
tree | 8c3cba590fb7e22645c2210197c86e5f21d592b1 /src/common | |
parent | 22526c62a556b75eeb7d2cc187374e7103a83c39 (diff) | |
download | tor-750b238aea995f3a474580bb62892714bea662bc.tar tor-750b238aea995f3a474580bb62892714bea662bc.tar.gz |
clean some includes
svn:r535
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/log.c | 2 | ||||
-rw-r--r-- | src/common/util.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/common/log.c b/src/common/log.c index 2feb075c0..81a709157 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -3,10 +3,8 @@ /* $Id$ */ #include "../or/or.h" -#include "util.h" struct logfile_t; - typedef struct logfile_t { struct logfile_t *next; const char *filename; diff --git a/src/common/util.c b/src/common/util.c index 8c3c6eab6..c2ca39f0c 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4,14 +4,6 @@ #include "../or/or.h" -#ifdef MS_WINDOWS -#include <io.h> -#include <limits.h> -#include <process.h> -#endif - -#include "util.h" -#include "log.h" #ifdef HAVE_UNAME #include <sys/utsname.h> #endif @@ -29,6 +21,7 @@ void *tor_malloc(size_t size) { log_fn(LOG_ERR, "Out of memory. Dying."); exit(1); } + memset(result,'X',size); /* XXX deadbeef to encourage bugs */ return result; } |