Seperate real and user timer interfaces

Use more descriptive names, and make it clearer that real and user
timers work on different static storage.  The end goal is to be able to
reuse those timer functions, instead of inlining other timer
implementations subject to clock jumps.

Discussed with Scott Cheloha

1 files changed, 5 insertions, 2 deletions

diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c
index 90cf6de011..4238b15f61 100644
--- a/src/usr.bin/openssl/speed.c
+++ b/src/usr.bin/openssl/speed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: speed.c,v 1.20 2017/10/07 06:16:54 guenther Exp $ */
+/* $OpenBSD: speed.c,v 1.21 2017/12/05 15:02:06 jca Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -202,7 +202,10 @@ sig_done(int sig)
 static double
 Time_F(int s)
 {
-        return app_tminterval(s, usertime);
+        if (usertime)
+                return app_timer_user(s);
+        else
+                return app_timer_real(s);
 }