[or-cvs] r13391: Oops; fix compilation of control.c (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-02-05 16:39:51 -0500 (Tue, 05 Feb 2008)
New Revision: 13391

Modified:
   tor/trunk/
   tor/trunk/src/or/control.c
Log:
 r17917 at catbus:  nickm | 2008-02-05 16:38:15 -0500
 Oops; fix compilation of control.c



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

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2008-02-05 21:39:49 UTC (rev 13390)
+++ tor/trunk/src/or/control.c	2008-02-05 21:39:51 UTC (rev 13391)
@@ -1715,7 +1715,7 @@
         tor_snprintf(s, sizeof(s), "%d", get_n_authorities(V3_AUTHORITY));
         *answer = tor_strdup(s);
         log_warn(LD_GENERAL, "%s is deprecated; it no longer gives useful "
-                 "information");
+                 "information", question);
       }
     } else {
       return 0;
@@ -2685,7 +2685,7 @@
         return 0;
       else if (r == -1) {
         if (data_len + conn->incoming_cmd_cur_len > MAX_COMMAND_LINE_LENGTH) {
-          connection_write_str_to_buf("500 Line too long.\r\n", TO_CONN(conn));
+          connection_write_str_to_buf("500 Line too long.\r\n", conn);
           connection_stop_reading(TO_CONN(conn));
           connection_mark_for_close(TO_CONN(conn));
           conn->_base.hold_open_until_flushed = 1;