[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Port __FILE__ fix to maintenance branch
Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv1499/src/or
Modified Files:
Tag: tor-0_0_9-patches
or.h
Log Message:
Port __FILE__ fix to maintenance branch
Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.508
retrieving revision 1.508.2.1
diff -u -d -r1.508 -r1.508.2.1
--- or.h 13 Dec 2004 18:32:29 -0000 1.508
+++ or.h 22 Dec 2004 02:57:33 -0000 1.508.2.1
@@ -1070,9 +1070,10 @@
do { \
if (_circuit_mark_for_close(c)<0) { \
log(LOG_WARN,"Duplicate call to circuit_mark_for_close at %s:%d (first at %s:%d)", \
- __FILE__,__LINE__,c->marked_for_close_file,c->marked_for_close); \
+ _SHORT_FILE_,__LINE__, \
+ c->marked_for_close_file,c->marked_for_close); \
} else { \
- c->marked_for_close_file = __FILE__; \
+ c->marked_for_close_file = _SHORT_FILE_; \
c->marked_for_close = __LINE__; \
} \
} while (0)
@@ -1154,9 +1155,10 @@
do { \
if (_connection_mark_for_close(c)<0) { \
log(LOG_WARN,"Duplicate call to connection_mark_for_close at %s:%d (first at %s:%d)", \
- __FILE__,__LINE__,c->marked_for_close_file,c->marked_for_close); \
+ _SHORT_FILE_,__LINE__, \
+ c->marked_for_close_file,c->marked_for_close); \
} else { \
- c->marked_for_close_file = __FILE__; \
+ c->marked_for_close_file = _SHORT_FILE_; \
c->marked_for_close = __LINE__; \
} \
} while (0)