[or-cvs] wrong is ok, and right is fine, but in between is apparently

Roger Dingledine arma at seul.org
Sun Nov 28 11:39:53 UTC 2004


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

Modified Files:
	container.h log.c util.c 
Log Message:
wrong is ok, and right is fine, but in between is apparently
totally unacceptable to me.


Index: container.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/container.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- container.h	28 Nov 2004 09:05:45 -0000	1.7
+++ container.h	28 Nov 2004 11:39:51 -0000	1.8
@@ -61,7 +61,7 @@
     int var ## _sl_idx, var ## _sl_len=smartlist_len(sl);       \
     type var;                                                   \
     for (var ## _sl_idx = 0; var ## _sl_idx < var ## _sl_len;   \
-        ++var ## _sl_idx) {                                     \
+         ++var ## _sl_idx) {                                    \
       var = smartlist_get((sl),var ## _sl_idx);                 \
       cmd;                                                      \
     } } while (0)

Index: log.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/log.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- log.c	28 Nov 2004 09:05:45 -0000	1.77
+++ log.c	28 Nov 2004 11:39:51 -0000	1.78
@@ -105,7 +105,7 @@
   tor_snprintf(buf+n, sizeof(buf)-n,
                "Tor %s opening %slog file.\n", VERSION, is_new?"new ":"");
   if (fputs(buf, lf->file) == EOF ||
-     fflush(lf->file) == EOF) /* error */
+      fflush(lf->file) == EOF) /* error */
     return -1; /* failed */
   return 0;
 }
@@ -189,7 +189,7 @@
       continue;
     }
     if (fputs(buf, lf->file) == EOF ||
-       fflush(lf->file) == EOF) { /* error */
+        fflush(lf->file) == EOF) { /* error */
       /* don't log the error! Blow away this log entry and continue. */
       logfile_t *victim = lf;
       lf = victim->next;

Index: util.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/util.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- util.c	28 Nov 2004 09:14:07 -0000	1.187
+++ util.c	28 Nov 2004 11:39:51 -0000	1.188
@@ -1208,7 +1208,7 @@
   } else {
     endptr = NULL;
     *port_min_out = (uint16_t) tor_parse_long(port, 10, 1, 65535,
-                                               NULL, &endptr);
+                                              NULL, &endptr);
     if (*endptr == '-') {
       port = endptr+1;
       endptr = NULL;



More information about the tor-commits mailing list