[tor-commits] [tor/release-0.3.5] Update and fix a couple of comments in meminfo.c

nickm at torproject.org nickm at torproject.org
Wed Jan 16 19:43:57 UTC 2019


commit cbcf75d72852c457da4b1da544e7dac0ca859592
Author: Kris Katterjohn <katterjohn at gmail.com>
Date:   Thu Jan 3 17:24:26 2019 -0600

    Update and fix a couple of comments in meminfo.c
    
    This fixes a typo and also notes that HW_PHYSMEM64 is defined on
    NetBSD (not just OpenBSD).
    
    Signed-off-by: Kris Katterjohn <katterjohn at gmail.com>
---
 src/lib/meminfo/meminfo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c
index 0f536323f..f23318889 100644
--- a/src/lib/meminfo/meminfo.c
+++ b/src/lib/meminfo/meminfo.c
@@ -60,7 +60,7 @@ tor_log_mallinfo(int severity)
 ENABLE_GCC_WARNING(aggregate-return)
 
 #if defined(HW_PHYSMEM64)
-/* This appears to be an OpenBSD thing */
+/* OpenBSD and NetBSD define this */
 #define INT64_HW_MEM HW_PHYSMEM64
 #elif defined(HW_MEMSIZE)
 /* OSX defines this one */
@@ -115,7 +115,7 @@ get_total_system_memory_impl(void)
   return ms.ullTotalPhys;
 
 #elif defined(HAVE_SYSCTL) && defined(INT64_HW_MEM)
-  /* On many systems, HW_PYHSMEM is clipped to 32 bits; let's use a better
+  /* On many systems, HW_PHYSMEM is clipped to 32 bits; let's use a better
    * variant if we know about it. */
   uint64_t memsize = 0;
   size_t len = sizeof(memsize);





More information about the tor-commits mailing list