forked from osmocom/wireshark
Don't call an argument "time", as this is a function.
svn path=/trunk/; revision=25538
This commit is contained in:
parent
98a15b7e80
commit
926e31da26
|
@ -152,9 +152,9 @@ int nstime_cmp (nstime_t *a, const nstime_t *b )
|
||||||
* converts nstime to double, time base is milli seconds
|
* converts nstime to double, time base is milli seconds
|
||||||
*/
|
*/
|
||||||
|
|
||||||
double nstime_to_msec(const nstime_t *time)
|
double nstime_to_msec(const nstime_t *nstime)
|
||||||
{
|
{
|
||||||
return ((double)time->secs*1000 + (double)time->nsecs/1000000);
|
return ((double)nstime->secs*1000 + (double)nstime->nsecs/1000000);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -162,9 +162,9 @@ double nstime_to_msec(const nstime_t *time)
|
||||||
* converts nstime to double, time base is seconds
|
* converts nstime to double, time base is seconds
|
||||||
*/
|
*/
|
||||||
|
|
||||||
double nstime_to_sec(const nstime_t *time)
|
double nstime_to_sec(const nstime_t *nstime)
|
||||||
{
|
{
|
||||||
return ((double)time->secs + (double)time->nsecs/1000000000);
|
return ((double)nstime->secs + (double)nstime->nsecs/1000000000);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -172,9 +172,9 @@ double nstime_to_sec(const nstime_t *time)
|
||||||
* converts wtap_nstime to double, time base is seconds
|
* converts wtap_nstime to double, time base is seconds
|
||||||
*/
|
*/
|
||||||
|
|
||||||
double wtap_nstime_to_sec(const struct wtap_nstime *time)
|
double wtap_nstime_to_sec(const struct wtap_nstime *nstime)
|
||||||
{
|
{
|
||||||
return ((double)time->secs + (double)time->nsecs/1000000000);
|
return ((double)nstime->secs + (double)nstime->nsecs/1000000000);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -81,12 +81,12 @@ extern void nstime_sum(nstime_t *sum, const nstime_t *b, const nstime_t *a );
|
||||||
extern int nstime_cmp(nstime_t *a, const nstime_t *b );
|
extern int nstime_cmp(nstime_t *a, const nstime_t *b );
|
||||||
|
|
||||||
/* converts nstime to double, time base is milli seconds */
|
/* converts nstime to double, time base is milli seconds */
|
||||||
extern double nstime_to_msec(const nstime_t *time);
|
extern double nstime_to_msec(const nstime_t *nstime);
|
||||||
|
|
||||||
/* converts nstime to double, time base is seconds */
|
/* converts nstime to double, time base is seconds */
|
||||||
extern double nstime_to_sec(const nstime_t *time);
|
extern double nstime_to_sec(const nstime_t *nstime);
|
||||||
|
|
||||||
/* converts wtap_nstime to double, time base is seconds */
|
/* converts wtap_nstime to double, time base is seconds */
|
||||||
extern double wtap_nstime_to_sec(const struct wtap_nstime *time);
|
extern double wtap_nstime_to_sec(const struct wtap_nstime *nstime);
|
||||||
|
|
||||||
#endif /* __NSTIME_H__ */
|
#endif /* __NSTIME_H__ */
|
||||||
|
|
Loading…
Reference in New Issue