[or-cvs] r13475: Fix command.c compilation with gcc 4.2 warnings enabled. (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-02-11 23:37:00 -0500 (Mon, 11 Feb 2008)
New Revision: 13475

Modified:
   tor/trunk/
   tor/trunk/src/or/command.c
Log:
 r18029@catbus:  nickm | 2008-02-11 12:36:39 -0500
 Fix command.c compilation with gcc 4.2 warnings enabled.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r18029] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/command.c
===================================================================
--- tor/trunk/src/or/command.c	2008-02-12 00:16:52 UTC (rev 13474)
+++ tor/trunk/src/or/command.c	2008-02-12 04:37:00 UTC (rev 13475)
@@ -489,15 +489,11 @@
 
   log_info(LD_OR, "Negotiated version %d with %s",
            highest_supported_version, safe_str(conn->_base.address));
+  tor_assert(conn->link_proto >= 2);
 
-  if (highest_supported_version >= 2) {
-    if (connection_or_send_netinfo(conn) < 0) {
-      connection_mark_for_close(TO_CONN(conn));
-      return;
-    }
-  } else {
-    /* Should be impossible. */
-    tor_fragile_assert();
+  if (connection_or_send_netinfo(conn) < 0) {
+    connection_mark_for_close(TO_CONN(conn));
+    return;
   }
 }