[or-cvs] clean whitespace and compilation fix on last NT service patch

Nick Mathewson nickm at seul.org
Sat Feb 5 21:38:29 UTC 2005


Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv31810/src/or

Modified Files:
      Tag: tor-0_0_9-patches
	main.c 
Log Message:
clean whitespace and compilation fix on last NT service patch

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.407.2.11
retrieving revision 1.407.2.12
diff -u -d -r1.407.2.11 -r1.407.2.12
--- main.c	5 Feb 2005 21:30:41 -0000	1.407.2.11
+++ main.c	5 Feb 2005 21:38:27 -0000	1.407.2.12
@@ -100,7 +100,7 @@
   tor_assert(conn);
   tor_assert(conn->s >= 0);
 
-  if (nfds >= get_options()->MaxConn-1) {
+  if (nfds >= get_options()->_MaxConn-1) {
     log_fn(LOG_WARN,"Failing because we have %d connections already. Please raise your ulimit -n.", nfds);
     return -1;
   }
@@ -1338,17 +1338,17 @@
   ChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &sdBuff);
 
   /* Start the service, so you don't have to muck with it in the SCM */
-  if(StartService(hService, 0, NULL)) {
+  if (StartService(hService, 0, NULL)) {
     /* Loop until the service has finished attempting to start */
-	while(QueryServiceStatus(hService, &service_status) &&
-		  service_status.dwCurrentState == SERVICE_START_PENDING)
-		  Sleep(500);
+    while (QueryServiceStatus(hService, &service_status) &&
+           service_status.dwCurrentState == SERVICE_START_PENDING)
+      Sleep(500);
 
-	/* Check if it started successfully or not */
+    /* Check if it started successfully or not */
     if(service_status.dwCurrentState == SERVICE_RUNNING)
-   	  printf("Service installed and started successfully.\n");
+      printf("Service installed and started successfully.\n");
     else
-	  printf("Service installed, but failed to start.\n");
+      printf("Service installed, but failed to start.\n");
   }
   else {
     printf("Service installed, but failed to start.\n");



More information about the tor-commits mailing list