From c6f2d725d005f912830b523aa1d1a419f4e22ecd Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Oct 2006 02:35:51 +0000
Subject: r8957@totoro: nickm | 2006-10-08 22:35:17 -0400 The otherwise
regrettable MIPSpro C compiler warns about values set but never used, and
about mixing enums and ints; these are good warnings, and so should be fixed.
This removes some dead code and some potential bugs. Thanks to pnx.
svn:r8664
---
src/or/config.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'src/or/config.c')
diff --git a/src/or/config.c b/src/or/config.c
index ac604bd35..7ba1e22b0 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1555,13 +1555,11 @@ option_reset(config_format_t *fmt, or_options_t *options,
config_var_t *var, int use_defaults)
{
config_line_t *c;
- void *lvalue;
char *msg = NULL;
CHECK(fmt, options);
option_clear(fmt, options, var); /* clear it first */
if (!use_defaults)
return; /* all done */
- lvalue = STRUCT_VAR_P(options, var->var_offset);
if (var->initvalue) {
c = tor_malloc_zero(sizeof(config_line_t));
c->key = tor_strdup(var->name);
@@ -3247,7 +3245,7 @@ static int
parse_dir_server_line(const char *line, int validate_only)
{
smartlist_t *items = NULL;
- int r, idx;
+ int r;
char *addrport=NULL, *address=NULL, *nickname=NULL, *fingerprint=NULL;
uint16_t port;
char digest[DIGEST_LEN];
@@ -3262,7 +3260,6 @@ parse_dir_server_line(const char *line, int validate_only)
goto err;
}
- idx = 0;
if (is_legal_nickname(smartlist_get(items, 0))) {
nickname = smartlist_get(items, 0);
smartlist_del_keeporder(items, 0);
--
cgit v1.2.3