aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-11-15 03:05:23 +0000
committerNick Mathewson <nickm@torproject.org>2005-11-15 03:05:23 +0000
commit9b432311c4d692d68f913027a95e050b1067c5d9 (patch)
treeb1488e36ea7fd8691f6ac1c2d2c2cf2cb0eabd90 /src/or/main.c
parent4cd7bddfc332aa14621235beb649b73f494266b0 (diff)
downloadtor-9b432311c4d692d68f913027a95e050b1067c5d9.tar
tor-9b432311c4d692d68f913027a95e050b1067c5d9.tar.gz
Make new logging stuff work on windows; fix a couple of windows typos.
svn:r5375
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 1bda2c023..013965db7 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1567,7 +1567,7 @@ nt_service_control(DWORD request)
void
nt_service_body(int argc, char **argv)
{
- int err;
+ int r;
service_status.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
service_status.dwCurrentState = SERVICE_START_PENDING;
service_status.dwControlsAccepted =
@@ -1585,21 +1585,21 @@ nt_service_body(int argc, char **argv)
// check for torrc
if (nt_torrc_is_present()) {
- err = tor_init(backup_argc, backup_argv); // refactor this part out of tor_main and do_main_loop
- if (err) {
- err = NT_SERVICE_ERROR_TORINIT_FAILED;
+ r = tor_init(backup_argc, backup_argv); // refactor this part out of tor_main and do_main_loop
+ if (r) {
+ r = NT_SERVICE_ERROR_TORINIT_FAILED;
}
}
else {
err(LD_CONFIG, "torrc is not in the current working directory. The Tor service will not start.");
- err = NT_SERVICE_ERROR_NO_TORRC;
+ r = NT_SERVICE_ERROR_NO_TORRC;
}
- if (err) {
+ if (r) {
// failed.
service_status.dwCurrentState = SERVICE_STOPPED;
- service_status.dwWin32ExitCode = err;
- service_status.dwServiceSpecificExitCode = err;
+ service_status.dwWin32ExitCode = r;
+ service_status.dwServiceSpecificExitCode = r;
SetServiceStatus(hStatus, &service_status);
return;
}