Coalesce v0 and v1 fields of rend_intro_cell_t

This saves a tiny bit of code, and makes a longstanding coverity
false positive go away.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/or/rendservice.h b/src/or/rendservice.h
index c2342ef573..05502cac5d 100644
--- a/src/or/rendservice.h
+++ b/src/or/rendservice.h
@@ -38,13 +38,9 @@ struct rend_intro_cell_s {
   /* Version-specific parts */
   union {
     struct {
-      /* Rendezvous point nickname */
-      uint8_t rp[20];
-    } v0;
-    struct {
       /* Rendezvous point nickname or hex-encoded key digest */
       uint8_t rp[42];
-    } v1;
+    } v0_v1;
     struct {
       /* The extend_info_t struct has everything v2 uses */
       extend_info_t *extend_info;