[tor-commits] [tor/master] Rename REGISTER_SUCCESS_ALSO_DECRYPTED to REGISTER_SUCCESS_AND_DECRYPTED.

[dgoulet at torproject.org]

commit 21b3303657f724e7ce4362483092680368839058
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Aug 5 15:45:48 2019 +0300

    Rename REGISTER_SUCCESS_ALSO_DECRYPTED to REGISTER_SUCCESS_AND_DECRYPTED.
---
 src/feature/control/control_hs.c | 2 +-
 src/feature/hs/hs_client.c       | 2 +-
 src/feature/hs/hs_client.h       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/feature/control/control_hs.c b/src/feature/control/control_hs.c
index 33df3800c..4c1d16a8c 100644
--- a/src/feature/control/control_hs.c
+++ b/src/feature/control/control_hs.c
@@ -148,7 +148,7 @@ handle_control_onion_client_auth_add(control_connection_t *conn,
   case REGISTER_SUCCESS_ALREADY_EXISTS:
     control_printf_endreply(conn, 251,"Client for onion existed and replaced");
     break;
-  case REGISTER_SUCCESS_ALSO_DECRYPTED:
+  case REGISTER_SUCCESS_AND_DECRYPTED:
     control_printf_endreply(conn, 252,"Registered client and decrypted desc");
     break;
   case REGISTER_SUCCESS:
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index 34574e4bd..787b29b57 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -1480,7 +1480,7 @@ hs_client_register_auth_credentials(hs_client_service_authorization_t *creds)
   /** Now that we set the new credentials, also try to decrypt any cached
    *  descriptors. */
   if (hs_cache_client_new_auth_parse(&service_identity_pk)) {
-    retval = REGISTER_SUCCESS_ALSO_DECRYPTED;
+    retval = REGISTER_SUCCESS_AND_DECRYPTED;
   }
 
   return retval;
diff --git a/src/feature/hs/hs_client.h b/src/feature/hs/hs_client.h
index e3aff9949..04827ea92 100644
--- a/src/feature/hs/hs_client.h
+++ b/src/feature/hs/hs_client.h
@@ -40,7 +40,7 @@ typedef enum {
   REGISTER_SUCCESS_ALREADY_EXISTS,
   /* We successfuly registered these credentials, and also decrypted a cached
    * descriptor. */
-  REGISTER_SUCCESS_ALSO_DECRYPTED,
+  REGISTER_SUCCESS_AND_DECRYPTED,
   /* We failed to register these credentials, because of a bad HS address. */
   REGISTER_FAIL_BAD_ADDRESS,
 } hs_client_register_auth_status_t;