diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-12-23 04:22:55 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-12-23 04:22:55 +0000 |
| commit | c10faf50858943edafe042664b49f8a743df6d7c (patch) | |
| tree | c4434fb3d1f9d7a3a3dbf872cc68ce9e1883ab76 /src/or/config.c | |
| parent | 5b3e5e87bc705b8c55c8272c38aa8d888ba41c75 (diff) | |
| download | tor-c10faf50858943edafe042664b49f8a743df6d7c.tar.gz tor-c10faf50858943edafe042664b49f8a743df6d7c.zip | |
fix some irix compile complaints; make "kbytes" work as a memory unit
svn:r12936
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/or/config.c b/src/or/config.c index 045a9b9a00..ab69d0a6d3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -871,16 +871,16 @@ validate_dir_authorities(or_options_t *options, or_options_t *old_options) /* Now go through the four ways you can configure an alternate * set of directory authorities, and make sure none are broken. */ for (cl = options->DirServers; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, 0, 1)<0) + if (parse_dir_server_line(cl->value, NO_AUTHORITY, 1)<0) return -1; for (cl = options->AlternateBridgeAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, 0, 1)<0) + if (parse_dir_server_line(cl->value, NO_AUTHORITY, 1)<0) return -1; for (cl = options->AlternateDirAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, 0, 1)<0) + if (parse_dir_server_line(cl->value, NO_AUTHORITY, 1)<0) return -1; for (cl = options->AlternateHSAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, 0, 1)<0) + if (parse_dir_server_line(cl->value, NO_AUTHORITY, 1)<0) return -1; return 0; } @@ -922,16 +922,16 @@ consider_adding_dir_authorities(or_options_t *options, } for (cl = options->DirServers; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, 0, 0)<0) + if (parse_dir_server_line(cl->value, NO_AUTHORITY, 0)<0) return -1; for (cl = options->AlternateBridgeAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, 0, 0)<0) + if (parse_dir_server_line(cl->value, NO_AUTHORITY, 0)<0) return -1; for (cl = options->AlternateDirAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, 0, 0)<0) + if (parse_dir_server_line(cl->value, NO_AUTHORITY, 0)<0) return -1; for (cl = options->AlternateHSAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, 0, 0)<0) + if (parse_dir_server_line(cl->value, NO_AUTHORITY, 0)<0) return -1; return 0; } @@ -4206,13 +4206,19 @@ static struct unit_table_t memory_units[] = { { "byte", 1<< 0 }, { "bytes", 1<< 0 }, { "kb", 1<<10 }, + { "kbyte", 1<<10 }, + { "kbytes", 1<<10 }, { "kilobyte", 1<<10 }, { "kilobytes", 1<<10 }, { "m", 1<<20 }, { "mb", 1<<20 }, + { "mbyte", 1<<20 }, + { "mbytes", 1<<20 }, { "megabyte", 1<<20 }, { "megabytes", 1<<20 }, { "gb", 1<<30 }, + { "gbyte", 1<<30 }, + { "gbytes", 1<<30 }, { "gigabyte", 1<<30 }, { "gigabytes", 1<<30 }, { "tb", U64_LITERAL(1)<<40 }, |