[or-cvs] clean up the circuit-mark-for-close patch

[Roger Dingledine]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitlist.c 
Log Message:
clean up the circuit-mark-for-close patch


Index: circuitlist.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitlist.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- circuitlist.c	3 Apr 2005 05:22:33 -0000	1.36
+++ circuitlist.c	3 Apr 2005 05:31:41 -0000	1.37
@@ -399,7 +399,7 @@
 
   if (circ->marked_for_close) {
     log(LOG_WARN,"Duplicate call to circuit_mark_for_close at %s:%d"
-        " (first at %s:%d)", line, file,
+        " (first at %s:%d)", file, line,
         circ->marked_for_close_file, circ->marked_for_close);
     return;
   }
@@ -457,7 +457,6 @@
     circuit_mark_for_close(circ->rend_splice);
     circ->rend_splice = NULL;
   }
-  return 0;
 }
 
 /** Verify that cpath layer <b>cp</b> has all of its invariants