Return instead of pointer-out

Author: marc-mabe

Zend/zend_time.c

@@ -16,35 +16,38 @@
 
 #include "zend_time.h"
 
-ZEND_API void zend_time_real_spec(struct timespec *ts) {
+ZEND_API struct timespec zend_time_real_spec() {
+   struct timespec ts;
+
 #if defined(HAVE_CLOCK_GETTIME)
 
-	(void) clock_gettime(CLOCK_REALTIME, ts);
+	(void) clock_gettime(CLOCK_REALTIME, &ts);
 
 #elif defined(HAVE_TIMESPEC_GET)
 
-	(void) timespec_get(ts, TIME_UTC);
+	(void) timespec_get(&ts, TIME_UTC);
 
 #elif defined(HAVE_GETTIMEOFDAY)
 
 	struct timeval tv;
 	(void) gettimeofday(&tv, NULL);
-	zend_time_val2spec(tv, ts);
+	ts = zend_time_val2spec(tv);
 
 #else
 
-	ts->tv_sec  = zend_time_real_get();
-	ts->tv_nsec = 0;
+	ts.tv_sec  = zend_time_real_get();
+	ts.tv_nsec = 0;
 
 #endif
+
+   return ts;
 }
 
 ZEND_API uint64_t zend_time_mono_fallback_nsec(void) {
 #if ZEND_HRTIME_AVAILABLE
 	return (uint64_t)zend_hrtime();
 #else
-	struct timespec ts;
-	zend_time_real_spec(&ts);
+	struct timespec ts = zend_time_real_spec();
 	return ((uint64_t) ts.tv_sec * ZEND_NANO_IN_SEC) + ts.tv_nsec;
 #endif
 }

Zend/zend_time.h

@@ -43,41 +43,57 @@
 BEGIN_EXTERN_C()
 
 /* Assign seconds to timeval */
-static zend_always_inline void zend_time_sec2val(time_t s, struct timeval *tv) {
-	tv->tv_sec  = (tv_sec_t) s;
-	tv->tv_usec = 0;
+static zend_always_inline struct timeval zend_time_sec2val(time_t s) {
+	struct timeval tv;
+
+	tv.tv_sec = (tv_sec_t) s;
+	tv.tv_usec = 0;
+
+	return tv;
 }
 
 /* Assign microseconds to timeval */
-static zend_always_inline void zend_time_usec2val(int64_t usec, struct timeval *tv) {
-	tv->tv_sec  = (tv_sec_t) (usec / ZEND_TIME_MICRO_IN_SEC);
-	tv->tv_usec = (tv_usec_t) (usec % ZEND_TIME_MICRO_IN_SEC);
+static zend_always_inline struct timeval zend_time_usec2val(int64_t usec) {
+	struct timeval tv;
+
+	tv.tv_sec = (tv_sec_t) (usec / ZEND_TIME_MICRO_IN_SEC);
+	tv.tv_usec = (tv_usec_t) (usec % ZEND_TIME_MICRO_IN_SEC);
 
-	if (UNEXPECTED(tv->tv_usec < 0)) {
-		tv->tv_usec += ZEND_TIME_MICRO_IN_SEC;
-		tv->tv_sec  -= 1;
+	if (UNEXPECTED(tv.tv_usec < 0)) {
+		tv.tv_usec += ZEND_TIME_MICRO_IN_SEC;
+		tv.tv_sec  -= 1;
 	}
+
+	return tv;
 }
 
 /* Assign double (seconds) to timeval */
-static zend_always_inline void zend_time_dbl2val(double s, struct timeval *tv) {
-	tv->tv_sec  = (tv_sec_t) s;
-	tv->tv_usec = (tv_usec_t) ((s - tv->tv_sec) * ZEND_TIME_MICRO_IN_SEC);
-
-	if (UNEXPECTED(tv->tv_usec < 0)) {
-		tv->tv_usec += ZEND_TIME_MICRO_IN_SEC;
-		tv->tv_sec  -= 1;
-	} else if (UNEXPECTED(tv->tv_usec >= ZEND_TIME_MICRO_IN_SEC)) {
+static zend_always_inline struct timeval zend_time_dbl2val(double s) {
+	struct timeval tv;
+
+	tv.tv_sec  = (tv_sec_t) s;
+	tv.tv_usec = (tv_usec_t) ((s - tv.tv_sec) * ZEND_TIME_MICRO_IN_SEC);
+
+	if (UNEXPECTED(tv.tv_usec < 0)) {
+		tv.tv_usec += ZEND_TIME_MICRO_IN_SEC;
+		tv.tv_sec  -= 1;
+	} else if (UNEXPECTED(tv.tv_usec >= ZEND_TIME_MICRO_IN_SEC)) {
 		// rare, but protects against rounding up to exactly 1 second
-		tv->tv_usec -= ZEND_TIME_MICRO_IN_SEC;
-		tv->tv_sec  += 1;
+		tv.tv_usec -= ZEND_TIME_MICRO_IN_SEC;
+		tv.tv_sec  += 1;
 	}
+
+	return tv;
 }
 
 /* Assign timeval to timespec */
-static zend_always_inline void zend_time_val2spec(struct timeval tv, struct timespec *ts) {
-	ts->tv_sec  = (time_t) tv.tv_sec;
-	ts->tv_nsec = (long) (tv.tv_usec * 1000);
+static zend_always_inline struct timespec zend_time_val2spec(struct timeval tv) {
+	struct timespec ts;
+
+	ts.tv_sec  = (time_t) tv.tv_sec;
+	ts.tv_nsec = (long) (tv.tv_usec * 1000);
+
+	return ts;
 }
 
 /* Current real/wall-time in seconds */
@@ -86,7 +102,7 @@ static zend_always_inline time_t zend_time_real_sec(void) {
 }
 
 /* Current real/wall-time in up-to nano seconds */
-ZEND_API void zend_time_real_spec(struct timespec *ts);
+ZEND_API struct timespec zend_time_real_spec(void);
 
 /* Monotonic time in nanoseconds with a fallback to real/wall-time 
    if no monotonic timer is available */