-/* $OpenBSD: apps.h,v 1.19 2016/08/30 14:34:59 deraadt Exp $ */
+/* $OpenBSD: apps.h,v 1.20 2017/12/05 15:02:06 jca Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
#define TM_START 0
#define TM_STOP 1
-double app_tminterval (int stop, int usertime);
+double app_timer_real(int stop);
+double app_timer_user(int stop);
#define OPENSSL_NO_SSL_INTERN
#include "apps.h"
-static double
-real_interval(int stop)
+double
+app_timer_real(int stop)
{
static struct timespec start;
struct timespec elapsed, now;
return 0.0;
}
-static double
-user_interval(int stop)
+double
+app_timer_user(int stop)
{
static struct timeval start;
struct timeval elapsed;
return 0.0;
}
-double
-app_tminterval(int stop, int usertime)
-{
- return (usertime) ? user_interval(stop) : real_interval(stop);
-}
-
int
setup_ui(void)
{
-/* $OpenBSD: s_time.c,v 1.18 2017/11/02 00:31:49 mestre Exp $ */
+/* $OpenBSD: s_time.c,v 1.19 2017/12/05 15:02:06 jca Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
#define STOP 1
static double
-tm_Time_F(int s)
+tm_Time_F(int op)
{
- return app_tminterval(s, 1);
+ return app_timer_user(op);
}
/***********************************************************************
-/* $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.
*
static double
Time_F(int s)
{
- return app_tminterval(s, usertime);
+ if (usertime)
+ return app_timer_user(s);
+ else
+ return app_timer_real(s);
}