Commit ef486e3c authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Fix every include path changed in the previous commit (automated) 

I am very glad to have written this script.
parent 63b4ea22

src/app/config/config.c

+45 −45
Original line number Diff line number Diff line
@@ -60,52 +60,52 @@ 
 **/



#define CONFIG_PRIVATE

#include "or/or.h"

#include "or/bridges.h"

#include "or/addressmap.h"

#include "or/channel.h"

#include "or/circuitbuild.h"

#include "or/circuitlist.h"

#include "or/circuitmux.h"

#include "or/circuitmux_ewma.h"

#include "or/circuitstats.h"

#include "core/or/or.h"

#include "feature/client/bridges.h"

#include "feature/client/addressmap.h"

#include "core/or/channel.h"

#include "core/or/circuitbuild.h"

#include "core/or/circuitlist.h"

#include "core/or/circuitmux.h"

#include "core/or/circuitmux_ewma.h"

#include "core/or/circuitstats.h"

#include "lib/compress/compress.h"

#include "or/config.h"

#include "app/config/config.h"

#include "lib/encoding/confline.h"

#include "or/connection.h"

#include "or/connection_edge.h"

#include "or/connection_or.h"

#include "or/consdiffmgr.h"

#include "or/control.h"

#include "or/confparse.h"

#include "or/cpuworker.h"

#include "core/mainloop/connection.h"

#include "core/or/connection_edge.h"

#include "core/or/connection_or.h"

#include "feature/dircache/consdiffmgr.h"

#include "feature/control/control.h"

#include "app/config/confparse.h"

#include "core/mainloop/cpuworker.h"

#include "lib/crypt_ops/crypto_rand.h"

#include "lib/crypt_ops/crypto_util.h"

#include "or/dirserv.h"

#include "or/dns.h"

#include "or/dos.h"

#include "or/entrynodes.h"

#include "or/git_revision.h"

#include "or/geoip.h"

#include "or/hibernate.h"

#include "or/main.h"

#include "or/networkstatus.h"

#include "or/nodelist.h"

#include "or/policies.h"

#include "or/relay.h"

#include "or/rendclient.h"

#include "or/rendservice.h"

#include "or/hs_config.h"

#include "or/rephist.h"

#include "or/router.h"

#include "feature/dircache/dirserv.h"

#include "feature/relay/dns.h"

#include "core/or/dos.h"

#include "feature/client/entrynodes.h"

#include "core/or/git_revision.h"

#include "feature/stats/geoip.h"

#include "feature/hibernate/hibernate.h"

#include "core/mainloop/main.h"

#include "feature/nodelist/networkstatus.h"

#include "feature/nodelist/nodelist.h"

#include "core/or/policies.h"

#include "core/or/relay.h"

#include "feature/rend/rendclient.h"

#include "feature/rend/rendservice.h"

#include "feature/hs/hs_config.h"

#include "feature/stats/rephist.h"

#include "feature/relay/router.h"

#include "lib/sandbox/sandbox.h"

#include "or/routerlist.h"

#include "or/routerset.h"

#include "or/scheduler.h"

#include "or/statefile.h"

#include "or/transports.h"

#include "or/ext_orport.h"

#include "or/voting_schedule.h"

#include "feature/nodelist/routerlist.h"

#include "feature/nodelist/routerset.h"

#include "core/or/scheduler.h"

#include "app/config/statefile.h"

#include "feature/client/transports.h"

#include "feature/relay/ext_orport.h"

#include "feature/dircommon/voting_schedule.h"

#ifdef _WIN32

#include <shlobj.h>

#endif
@@ -133,11 +133,11 @@ 
#include "lib/fs/conffile.h"

#include "lib/evloop/procmon.h"



#include "or/dirauth/dirvote.h"

#include "or/dirauth/mode.h"

#include "feature/dirauth/dirvote.h"

#include "feature/dirauth/mode.h"



#include "or/connection_st.h"

#include "or/port_cfg_st.h"

#include "core/or/connection_st.h"

#include "core/or/port_cfg_st.h"



#ifdef HAVE_SYSTEMD

#   if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__)

src/app/config/config.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#ifndef TOR_CONFIG_H

#define TOR_CONFIG_H



#include "or/or_options_st.h"

#include "app/config/or_options_st.h"

#include "lib/testsupport/testsupport.h"



#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN)

src/app/config/confparse.c

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 
 * specified, and a linked list of key-value pairs.

 */



#include "or/or.h"

#include "or/confparse.h"

#include "or/routerset.h"

#include "core/or/or.h"

#include "app/config/confparse.h"

#include "feature/nodelist/routerset.h"



#include "lib/container/bitarray.h"

#include "lib/encoding/confline.h"

src/app/config/statefile.c

+13 −13
Original line number Diff line number Diff line
@@ -29,22 +29,22 @@ 
 */



#define STATEFILE_PRIVATE

#include "or/or.h"

#include "or/circuitstats.h"

#include "or/config.h"

#include "or/confparse.h"

#include "or/connection.h"

#include "or/control.h"

#include "or/entrynodes.h"

#include "or/hibernate.h"

#include "or/main.h"

#include "or/rephist.h"

#include "or/router.h"

#include "core/or/or.h"

#include "core/or/circuitstats.h"

#include "app/config/config.h"

#include "app/config/confparse.h"

#include "core/mainloop/connection.h"

#include "feature/control/control.h"

#include "feature/client/entrynodes.h"

#include "feature/hibernate/hibernate.h"

#include "core/mainloop/main.h"

#include "feature/stats/rephist.h"

#include "feature/relay/router.h"

#include "lib/sandbox/sandbox.h"

#include "or/statefile.h"

#include "app/config/statefile.h"

#include "lib/encoding/confline.h"



#include "or/or_state_st.h"

#include "app/config/or_state_st.h"



#ifdef HAVE_UNISTD_H

#include <unistd.h>

src/app/main/ntmain.c

+4 −4
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 


#ifdef _WIN32



#include "or/or.h"

#include "or/config.h"

#include "or/main.h"

#include "app/ntmain.h"

#include "core/or/or.h"

#include "app/config/config.h"

#include "core/mainloop/main.h"

#include "app/main/ntmain.h"

#include "lib/log/win32err.h"

#include "lib/fs/winlib.h"

#include "lib/evloop/compat_libevent.h"