[or-cvs] [tor/maint-0.2.2 3/3] Consistency issues in load_windows_system_library patch. Thanks Sebastian

[nickm at torproject.org]

Author: Nick Mathewson <nickm at torproject.org>
Date: Fri, 24 Sep 2010 14:16:55 -0400
Subject: Consistency issues in load_windows_system_library patch. Thanks Sebastian
Commit: d073d7d4ebd461a1550595d0180f0367b67bcc16

---
 src/common/util.c |    2 +-
 src/or/eventdns.c |    1 -
 src/or/ntmain.c   |    1 -
 3 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c
index 12be008..caedc5e 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2800,7 +2800,7 @@ load_windows_system_library(const TCHAR *library_name)
 {
   TCHAR path[MAX_PATH];
   unsigned n;
-  n = GetSystemDirectory(path, 1024);
+  n = GetSystemDirectory(path, MAX_PATH);
   if (n == 0 || n + _tcslen(library_name) + 2 >= MAX_PATH)
     return 0;
   _tcscat(path, TEXT("\\"));
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index c6fcbd9..b929303 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -3131,7 +3131,6 @@ load_nameservers_with_getnetworkparams(void)
 	IP_ADDR_STRING *ns;
 	GetNetworkParams_fn_t fn;
 
-	/* XXXX Possibly, we should hardcode the location of this DLL. */
 	if (!(handle = load_windows_system_library(TEXT("iphlpapi.dll")))) {
 		log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll");
 		/* right now status = 0, doesn't that mean "good" - mikec */
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index e5855aa..46e7afb 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -138,7 +138,6 @@ nt_service_loadlibrary(void)
   if (service_fns.loaded)
     return;
 
-  /* XXXX Possibly, we should hardcode the location of this DLL. */
   if (!(library = load_windows_system_library(TEXT("advapi32.dll")))) {
     log_err(LD_GENERAL, "Couldn't open advapi32.dll.  Are you trying to use "
             "NT services on Windows 98? That doesn't work.");
-- 
1.7.1