Commit 45938298 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Remove util.h 

Inline its contents (which were all includes) into or.h, and some of
its contents into other places that didn't include or.h at all.
parent 0adcfbc7

src/common/include.am

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ COMMONHEADERS = \ 
  src/common/procmon.h				\

  src/common/timers.h				\

  src/common/token_bucket.h			\

  src/common/util.h				\

  src/common/workqueue.h



noinst_HEADERS+= $(COMMONHEADERS)

src/common/util.h

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/* Copyright (c) 2003-2004, Roger Dingledine

 * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.

 * Copyright (c) 2007-2018, The Tor Project, Inc. */

/* See LICENSE for licensing information */



/**

 * \file util.h

 * \brief Headers for util.c

 **/



#ifndef TOR_UTIL_H

#define TOR_UTIL_H



#include "orconfig.h"

#include "lib/arch/bytes.h"

#include "lib/cc/compat_compiler.h"

#include "lib/cc/torint.h"

#include "lib/ctime/di_ops.h"

#include "lib/encoding/cstring.h"

#include "lib/encoding/time_fmt.h"

#include "lib/err/torerr.h"

#include "lib/fs/dir.h"

#include "lib/fs/files.h"

#include "lib/fs/mmap.h"

#include "lib/fs/path.h"

#include "lib/fs/userdb.h"

#include "lib/intmath/addsub.h"

#include "lib/intmath/bits.h"

#include "lib/intmath/cmp.h"

#include "lib/intmath/logic.h"

#include "lib/intmath/muldiv.h"

#include "lib/log/escape.h"

#include "lib/log/ratelim.h"

#include "lib/log/util_bug.h"

#include "lib/malloc/util_malloc.h"

#include "lib/net/ipv4.h"

#include "lib/net/ipv6.h"

#include "lib/net/resolve.h"

#include "lib/net/socket.h"

#include "lib/string/compat_ctype.h"

#include "lib/string/compat_string.h"

#include "lib/string/parse_int.h"

#include "lib/string/printf.h"

#include "lib/string/scanf.h"

#include "lib/string/util_string.h"

#include "lib/testsupport/testsupport.h"

#include "lib/thread/threads.h"

#include "lib/time/compat_time.h"

#include "lib/wallclock/approx_time.h"

#include "lib/wallclock/timeval.h"



#endif /* !defined(TOR_UTIL_H) */

src/or/config.c

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ 
#include "or/rephist.h"

#include "or/router.h"

#include "lib/sandbox/sandbox.h"

#include "common/util.h"

#include "or/routerlist.h"

#include "or/routerset.h"

#include "or/scheduler.h"

src/or/dirauth/shared_random.c

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ 
#include "or/routerlist.h"

#include "or/shared_random_client.h"

#include "or/dirauth/shared_random_state.h"

#include "common/util.h"

#include "or/voting_schedule.h"



#include "or/dirauth/dirvote.h"

src/or/ext_orport.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include "or/ext_orport.h"

#include "or/main.h"

#include "or/proto_ext_or.h"

#include "common/util.h"



#include "or/or_connection_st.h"