salvage another 300 bytes per hup

svn:r3106
This commit is contained in:
Roger Dingledine 2004-12-07 09:11:38 +00:00
parent d9f86e2782
commit 41b809d2aa
2 changed files with 4 additions and 1 deletions

View File

@ -975,6 +975,8 @@ options_free(or_options_t *options)
int i; int i;
void *lvalue; void *lvalue;
tor_assert(options);
for (i=0; config_vars[i].name; ++i) { for (i=0; config_vars[i].name; ++i) {
lvalue = ((char*)options) + config_vars[i].var_offset; lvalue = ((char*)options) + config_vars[i].var_offset;
switch (config_vars[i].type) { switch (config_vars[i].type) {
@ -1005,6 +1007,7 @@ options_free(or_options_t *options)
break; break;
} }
} }
tor_free(options);
} }
/** Return true iff the option <b>var</b> has the same value in <b>o1</b> /** Return true iff the option <b>var</b> has the same value in <b>o1</b>

View File

@ -755,7 +755,7 @@ static int do_hup(void) {
log_fn(LOG_ERR,"Reading config failed--see warnings above. For usage, try -h."); log_fn(LOG_ERR,"Reading config failed--see warnings above. For usage, try -h.");
return -1; return -1;
} }
options = get_options(); options = get_options(); /* they have changed now */
if (authdir_mode(options)) { if (authdir_mode(options)) {
/* reload the approved-routers file */ /* reload the approved-routers file */
tor_snprintf(keydir,sizeof(keydir),"%s/approved-routers", options->DataDirectory); tor_snprintf(keydir,sizeof(keydir),"%s/approved-routers", options->DataDirectory);