Commit 5233de9a authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

tool_util: remove unused tvdiff_secs and remove tool_ prefix 

Closes #1532
parent cfd3e8f3

src/tool_util.c

+6 −19
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, 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;

}

src/tool_util.h

+3 −20
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, 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 */