aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-03-11 04:30:14 +0000
committerNick Mathewson <nickm@torproject.org>2008-03-11 04:30:14 +0000
commit8b24e01599f2838ace5a0995acf575711f067f1c (patch)
tree4886c6bf3c5435160d2bf4cc617857846bfa542d /src/or/control.c
parentd6507fb510dc40205523448c03fb8c6fca3ed8db (diff)
downloadtor-8b24e01599f2838ace5a0995acf575711f067f1c.tar
tor-8b24e01599f2838ace5a0995acf575711f067f1c.tar.gz
r18723@catbus: nickm | 2008-03-11 00:25:30 -0400
Fix bug spotted by mwenge: a server_event should not be a sever_event. Also, fix compile errors in config.c and control.c with --enable-gcc-warnings. svn:r13957
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 2dcac977c..c126e5df9 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -871,7 +871,8 @@ handle_control_loadconf(control_connection_t *conn, uint32_t len,
{
int retval;
char *errstring = NULL;
- char *msg = NULL;
+ const char *msg = NULL;
+ (void) len;
retval = options_init_from_string(body, CMD_RUN_TOR, NULL, &errstring);
@@ -3629,7 +3630,7 @@ control_event_status(int type, int severity, const char *format, va_list args)
status = "STATUS_CLIENT";
break;
case EVENT_STATUS_SERVER:
- status = "STATUS_SEVER";
+ status = "STATUS_SERVER";
break;
default:
log_warn(LD_BUG, "Unrecognized status type %d", type);