From ac632a784cdeecaef81e5f1fe45a20f43a93aea7 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 30 Dec 2014 12:07:28 -0500
Subject: 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.
---
 src/or/rendservice.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/or/rendservice.h')

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
@@ -37,14 +37,10 @@ struct rend_intro_cell_s {
   uint8_t version;
   /* 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;
-- 
cgit v1.2.3-54-g00ecf