[svn] GnuPG - r5450 - branches/STABLE-BRANCH-1-4/cipher

[svn author wk]

Author: wk
Date: 2010-10-18 12:02:29 +0200 (Mon, 18 Oct 2010)
New Revision: 5450

Modified:
   branches/STABLE-BRANCH-1-4/cipher/ChangeLog
   branches/STABLE-BRANCH-1-4/cipher/rndw32.c
Log:
Add a minor feature for w32.


Modified: branches/STABLE-BRANCH-1-4/cipher/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/cipher/ChangeLog	2010-10-18 09:24:48 UTC (rev 5449)
+++ branches/STABLE-BRANCH-1-4/cipher/ChangeLog	2010-10-18 10:02:29 UTC (rev 5450)
@@ -1,3 +1,7 @@
+2010-10-18  Werner Koch  <wk at g10code.com>
+
+	* rndw32.c (slow_gatherer_windowsNT): Add GNUPG_RNDW32_NOPERF envvar.
+
 2010-09-28  Steven M. Schweda  <sms at antinode.info>  (wk)
 
 	Changes to help the VMS port. See

Modified: branches/STABLE-BRANCH-1-4/cipher/rndw32.c
===================================================================
--- branches/STABLE-BRANCH-1-4/cipher/rndw32.c	2010-10-18 09:24:48 UTC (rev 5449)
+++ branches/STABLE-BRANCH-1-4/cipher/rndw32.c	2010-10-18 10:02:29 UTC (rev 5450)
@@ -477,9 +477,16 @@
      * worst-case estimate which is usually nowhere near the actual amount
      * required.  For example it may report that 128K of memory is required,
      * but only return 64K of data */
-#warning How shall we disable get performacne data 
-    if (0) 
-      log_debug ("Warning: get performance data disabled\n");
+    if (getenv("GNUPG_RNDW32_NOPERF"))
+      {
+        static int shown;
+        
+        if (!shown)
+          {
+            shown = 1;
+            g10_log_info ("note: get performance data has been disabled\n");
+          }
+      }
     else
     {	pPerfData =  xmalloc (cbPerfData);
 	for (;;) {