From 70c92c336661a164e3905be157aa8a16de77462a Mon Sep 17 00:00:00 2001 From: David Goulet Date: Tue, 1 May 2018 11:31:33 -0400 Subject: [PATCH] sr: Rename shared_random_common.{c|h} to shared_random_client.{c|h} No code behavior change. Pars of #25988 Signed-off-by: David Goulet --- src/or/control.c | 2 +- src/or/dirauth/shared_random.c | 2 +- src/or/dirauth/shared_random_state.c | 2 +- src/or/hs_common.c | 2 +- src/or/hs_service.c | 2 +- src/or/include.am | 4 ++-- src/or/routerparse.c | 2 +- .../{shared_random_common.c => shared_random_client.c} | 6 +++--- .../{shared_random_common.h => shared_random_client.h} | 10 +++++----- src/test/test_shared_random.c | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) rename src/or/{shared_random_common.c => shared_random_client.c} (98%) rename src/or/{shared_random_common.h => shared_random_client.h} (84%) diff --git a/src/or/control.c b/src/or/control.c index aab854ecdd..bc7597707f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -76,7 +76,7 @@ #include "router.h" #include "routerlist.h" #include "routerparse.h" -#include "shared_random_common.h" +#include "shared_random_client.h" #ifndef _WIN32 #include diff --git a/src/or/dirauth/shared_random.c b/src/or/dirauth/shared_random.c index c149328935..f7ff5c58bb 100644 --- a/src/or/dirauth/shared_random.c +++ b/src/or/dirauth/shared_random.c @@ -96,7 +96,7 @@ #include "router.h" #include "routerlist.h" #include "shared_random_state.h" -#include "shared_random_common.h" +#include "shared_random_client.h" #include "util.h" #include "voting_schedule.h" diff --git a/src/or/dirauth/shared_random_state.c b/src/or/dirauth/shared_random_state.c index ef5a27ee58..56c12c8c72 100644 --- a/src/or/dirauth/shared_random_state.c +++ b/src/or/dirauth/shared_random_state.c @@ -18,7 +18,7 @@ #include "networkstatus.h" #include "router.h" #include "shared_random_state.h" -#include "shared_random_common.h" +#include "shared_random_client.h" #include "dirauth/dirvote.h" diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 46903a2960..5edddd8940 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -28,7 +28,7 @@ #include "rendservice.h" #include "routerset.h" #include "router.h" -#include "shared_random_common.h" +#include "shared_random_client.h" #include "dirauth/shared_random_state.h" /* Trunnel */ diff --git a/src/or/hs_service.c b/src/or/hs_service.c index c4a473a5f7..e40e9203e7 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -24,7 +24,7 @@ #include "router.h" #include "routerkeys.h" #include "routerlist.h" -#include "shared_random_common.h" +#include "shared_random_client.h" #include "statefile.h" #include "hs_circuit.h" diff --git a/src/or/include.am b/src/or/include.am index d0937bab0d..9cae7d0039 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -103,7 +103,7 @@ LIBTOR_A_SOURCES = \ src/or/scheduler.c \ src/or/scheduler_kist.c \ src/or/scheduler_vanilla.c \ - src/or/shared_random_common.c \ + src/or/shared_random_client.c \ src/or/statefile.c \ src/or/status.c \ src/or/torcert.c \ @@ -265,7 +265,7 @@ ORHEADERS = \ src/or/routerset.h \ src/or/routerparse.h \ src/or/scheduler.h \ - src/or/shared_random_common.h \ + src/or/shared_random_client.h \ src/or/statefile.h \ src/or/status.h \ src/or/torcert.h \ diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 5d4be0870a..a729aa4b11 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -74,7 +74,7 @@ #include "entrynodes.h" #include "torcert.h" #include "sandbox.h" -#include "shared_random_common.h" +#include "shared_random_client.h" #include "voting_schedule.h" #include "dirauth/shared_random.h" diff --git a/src/or/shared_random_common.c b/src/or/shared_random_client.c similarity index 98% rename from src/or/shared_random_common.c rename to src/or/shared_random_client.c index 9d47e3a49e..3aef83cef4 100644 --- a/src/or/shared_random_common.c +++ b/src/or/shared_random_client.c @@ -2,14 +2,14 @@ /* See LICENSE for licensing information */ /** - * \file shared_random_common.c + * \file shared_random_client.c * \brief This file contains functions that are from the shared random * subsystem but used by many part of tor. The full feature is built * as part of the dirauth module. **/ -#define SHARED_RANDOM_COMMON_PRIVATE -#include "shared_random_common.h" +#define SHARED_RANDOM_CLIENT_PRIVATE +#include "shared_random_client.h" #include "config.h" #include "voting_schedule.h" diff --git a/src/or/shared_random_common.h b/src/or/shared_random_client.h similarity index 84% rename from src/or/shared_random_common.h rename to src/or/shared_random_client.h index 35e08ddf32..89c608d45f 100644 --- a/src/or/shared_random_common.h +++ b/src/or/shared_random_client.h @@ -2,12 +2,12 @@ /* See LICENSE for licensing information */ /** - * \file shared_random_common.h - * \brief Header file for shared_random_common.c. + * \file shared_random_client.h + * \brief Header file for shared_random_client.c. **/ -#ifndef TOR_SHARED_RANDOM_COMMON_H -#define TOR_SHARED_RANDOM_COMMON_H +#ifndef TOR_SHARED_RANDOM_CLIENT_H +#define TOR_SHARED_RANDOM_CLIENT_H /* Dirauth module. */ #include "dirauth/shared_random.h" @@ -43,5 +43,5 @@ time_t get_start_time_of_current_round(void); #endif /* TOR_UNIT_TESTS */ -#endif /* TOR_SHARED_RANDOM_COMMON_H */ +#endif /* TOR_SHARED_RANDOM_CLIENT_H */ diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 1c16524b65..775a1c1d23 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -16,7 +16,7 @@ #include "routerlist.h" #include "router.h" #include "routerparse.h" -#include "shared_random_common.h" +#include "shared_random_client.h" #include "networkstatus.h" #include "log_test_helpers.h" #include "voting_schedule.h"