fix warning, adjust function name style

Signed-off-by: Daniel A. Steffen <[email protected]>

Author: das

src/internal.h

@@ -528,7 +528,7 @@ void _dispatch_vtable_init(void);
 char *_dispatch_get_build(void);
 
 uint64_t _dispatch_timeout(dispatch_time_t when);
-uint64_t _dispatch_time_to_nanoseconds(dispatch_time_t when);
+uint64_t _dispatch_time_nanoseconds_since_epoch(dispatch_time_t when);
 
 extern bool _dispatch_safe_fork, _dispatch_child_of_unsafe_fork;
 

src/semaphore.c

@@ -342,7 +342,7 @@ _dispatch_semaphore_wait_slow(dispatch_semaphore_t dsema,
 		}
 #elif USE_POSIX_SEM
 		do {
-			uint64_t nsec = _dispatch_time_to_nanoseconds(timeout);
+			uint64_t nsec = _dispatch_time_nanoseconds_since_epoch(timeout);
 			_timeout.tv_sec = (typeof(_timeout.tv_sec))(nsec / NSEC_PER_SEC);
 			_timeout.tv_nsec = (typeof(_timeout.tv_nsec))(nsec % NSEC_PER_SEC);
 			ret = slowpath(sem_timedwait(&dsema->dsema_sem, &_timeout));
@@ -582,7 +582,7 @@ _dispatch_group_wait_slow(dispatch_semaphore_t dsema, dispatch_time_t timeout)
 		}
 #elif USE_POSIX_SEM
 		do {
-			uint64_t nsec = _dispatch_time_to_nanoseconds(timeout);
+			uint64_t nsec = _dispatch_time_nanoseconds_since_epoch(timeout);
 			_timeout.tv_sec = (typeof(_timeout.tv_sec))(nsec / NSEC_PER_SEC);
 			_timeout.tv_nsec = (typeof(_timeout.tv_nsec))(nsec % NSEC_PER_SEC);
 			ret = slowpath(sem_timedwait(&dsema->dsema_sem, &_timeout));

src/time.c

@@ -147,14 +147,14 @@ _dispatch_timeout(dispatch_time_t when)
 }
 
 uint64_t
-_dispatch_time_to_nanoseconds(dispatch_time_t when)
+_dispatch_time_nanoseconds_since_epoch(dispatch_time_t when)
 {
 	if (when == DISPATCH_TIME_FOREVER) {
 		return DISPATCH_TIME_FOREVER;
 	}
 	if ((int64_t)when < 0) {
 		// time in nanoseconds since the POSIX epoch already
-		return -(int64_t)when;
+		return (uint64_t)-(int64_t)when;
 	}
 	return _dispatch_get_nanoseconds() + _dispatch_timeout(when);
 }