summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-11-28 11:39:53 +0000
committerRoger Dingledine <arma@torproject.org>2004-11-28 11:39:53 +0000
commit22727b4edc64b26aed850297dbf274bab7fd6c44 (patch)
tree1456f14c2cff195e87fc8080a741ae05eb2fbe48 /src/common
parentf7c6ad065e2c433acb3fcccb1e9c7812c262579d (diff)
downloadtor-22727b4edc64b26aed850297dbf274bab7fd6c44.tar.gz
tor-22727b4edc64b26aed850297dbf274bab7fd6c44.zip
wrong is ok, and right is fine, but in between is apparently
totally unacceptable to me. svn:r3005
Diffstat (limited to 'src/common')
-rw-r--r--src/common/container.h2
-rw-r--r--src/common/log.c4
-rw-r--r--src/common/util.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/common/container.h b/src/common/container.h
index dbe45a31e3..aab568d4a9 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -61,7 +61,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join,
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)
diff --git a/src/common/log.c b/src/common/log.c
index f275d025f9..f227ebc399 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -105,7 +105,7 @@ static int log_tor_version(logfile_t *lf, int reset)
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 @@ logv(int severity, const char *funcname, const char *format, va_list ap)
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;
diff --git a/src/common/util.c b/src/common/util.c
index 055dfbcc57..f8eb3019a9 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1208,7 +1208,7 @@ parse_addr_and_port_range(const char *s, uint32_t *addr_out,
} 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;