[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 212/254: tool_util: remove unused tvdiff_secs and r
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 212/254: tool_util: remove unused tvdiff_secs and remove tool_ prefix |
Date: |
Sat, 17 Jun 2017 16:54:04 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.1
in repository gnurl.
commit 5233de9ac66035ad3bc0d04dffd81fb50d58fb5b
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri Jun 2 14:13:02 2017 +0200
tool_util: remove unused tvdiff_secs and remove tool_ prefix
Closes #1532
---
src/tool_util.c | 25 ++++++-------------------
src/tool_util.h | 23 +++--------------------
2 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/src/tool_util.c b/src/tool_util.c
index dab60f0bd..875411e3b 100644
--- a/src/tool_util.c
+++ b/src/tool_util.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -27,7 +27,7 @@
#if defined(WIN32) && !defined(MSDOS)
-struct timeval tool_tvnow(void)
+struct timeval tvnow(void)
{
/*
** GetTickCount() is available on _all_ Windows versions from W95 up
@@ -52,7 +52,7 @@ struct timeval tool_tvnow(void)
#elif defined(HAVE_CLOCK_GETTIME_MONOTONIC)
-struct timeval tool_tvnow(void)
+struct timeval tvnow(void)
{
/*
** clock_gettime() is granted to be increased monotonically when the
@@ -86,7 +86,7 @@ struct timeval tool_tvnow(void)
#elif defined(HAVE_GETTIMEOFDAY)
-struct timeval tool_tvnow(void)
+struct timeval tvnow(void)
{
/*
** gettimeofday() is not granted to be increased monotonically, due to
@@ -100,7 +100,7 @@ struct timeval tool_tvnow(void)
#else
-struct timeval tool_tvnow(void)
+struct timeval tvnow(void)
{
/*
** time() returns the value of time in seconds since the Epoch.
@@ -119,21 +119,8 @@ struct timeval tool_tvnow(void)
*
* Returns: the time difference in number of milliseconds.
*/
-long tool_tvdiff(struct timeval newer, struct timeval older)
+long tvdiff(struct timeval newer, struct timeval older)
{
return (long)(newer.tv_sec-older.tv_sec)*1000+
(long)(newer.tv_usec-older.tv_usec)/1000;
}
-
-/*
- * Same as tool_tvdiff but with full usec resolution.
- *
- * Returns: the time difference in seconds with subsecond resolution.
- */
-double tool_tvdiff_secs(struct timeval newer, struct timeval older)
-{
- if(newer.tv_sec != older.tv_sec)
- return (double)(newer.tv_sec-older.tv_sec)+
- (double)(newer.tv_usec-older.tv_usec)/1000000.0;
- return (double)(newer.tv_usec-older.tv_usec)/1000000.0;
-}
diff --git a/src/tool_util.h b/src/tool_util.h
index d5b3898ff..fda1e61bf 100644
--- a/src/tool_util.h
+++ b/src/tool_util.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,7 +23,7 @@
***************************************************************************/
#include "tool_setup.h"
-struct timeval tool_tvnow(void);
+struct timeval tvnow(void);
/*
* Make sure that the first argument (t1) is the more recent time and t2 is
@@ -31,24 +31,7 @@ struct timeval tool_tvnow(void);
*
* Returns: the time difference in number of milliseconds.
*/
-long tool_tvdiff(struct timeval t1, struct timeval t2);
-
-/*
- * Same as tool_tvdiff but with full usec resolution.
- *
- * Returns: the time difference in seconds with subsecond resolution.
- */
-double tool_tvdiff_secs(struct timeval t1, struct timeval t2);
-
-long tool_tvlong(struct timeval t1);
-
-#undef tvnow
-#undef tvdiff
-#undef tvdiff_secs
-
-#define tvnow() tool_tvnow()
-#define tvdiff(a,b) tool_tvdiff((a), (b))
-#define tvdiff_secs(a,b) tool_tvdiff_secs((a), (b))
+long tvdiff(struct timeval t1, struct timeval t2);
#endif /* HEADER_CURL_TOOL_UTIL_H */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 158/254: cmake: remove CURL_CA_BUNDLE from cmake TODO, (continued)
- [GNUnet-SVN] [gnurl] 158/254: cmake: remove CURL_CA_BUNDLE from cmake TODO, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 178/254: RELEASE-NOTES: synced with 3aaac8c2f, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 202/254: typecheck-gcc.h: check CURLINFO_CERTINFO, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 230/254: test1521: make the code < 80 columns wide, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 72/254: ssh: fix compiler warning from e40e9d7f0de, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 50/254: curl_setup: Ensure no more than one IDN lib is enabled, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 120/254: formboundary: convert assert into run-time check, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 114/254: tool_msgs: remove wrong cast, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 98/254: tests: fix -Wcast-qual warnings, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 228/254: typecheck-gcc: allow CURLOPT_STDERR to be NULL too, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 212/254: tool_util: remove unused tvdiff_secs and remove tool_ prefix,
gnunet <=
- [GNUnet-SVN] [gnurl] 143/254: RELEASE-NOTES: synced with eb16305e6, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 93/254: unit1305: fix compiler warning, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 226/254: test1538: added "verbose logs" keyword, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 239/254: examples/multi-uv.c: fix deprecated symbol, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 159/254: cmake: remove unused variables: GNUTLS_ENABLED, NSS_ENABLED, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 173/254: TODO: 6.4 is done, send telnet data in chunks, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 221/254: BINDINGS: add Ring binding, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 216/254: x509asn1: fix implicit-fallthrough warning with GCC 7, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 179/254: mbedtls: fix variable shadow warning, gnunet, 2017/06/17
- [GNUnet-SVN] [gnurl] 246/254: FindWin32CACert: Use a temporary buffer on the stack, gnunet, 2017/06/17