better error handling

Author: dunglas

Zend/zend.c

@@ -833,11 +833,9 @@ static void zend_timer_create() /* {{{ */
 	sev.sigev_signo = SIGIO;
 	sev.sigev_notify_thread_id = (pid_t) syscall(SYS_gettid);
 
-	int errn = timer_create(CLOCK_THREAD_CPUTIME_ID, &sev, &EG(timer));
-	if (errn != 0) {
+	if (timer_create(CLOCK_THREAD_CPUTIME_ID, &sev, &EG(timer)) != 0) {
 		EG(timer) = 0;
-
-		zend_strerror_noreturn(E_ERROR, errn, "Could not create timer");
+		zend_strerror_noreturn(E_ERROR, errno, "Could not create timer");
 	}
 
 #  ifdef TIMER_DEBUG
@@ -865,10 +863,11 @@ static void zend_thread_shutdown_handler(void) { /* {{{ */
 # ifdef ZEND_TIMER
 	timer_t timer = EG(timer);
 
-	if (timer == 0) return;
+	if (timer == 0)
+		zend_error_noreturn(E_ERROR, "Could not c timer");
 
-	int errn = timer_delete(EG(timer));
-	if (errn != 0) zend_strerror_noreturn(E_ERROR, errn, "Could not delete timer");
+	if (timer_delete(timer) != 0)
+		zend_strerror_noreturn(E_ERROR, errno, "Could not delete timer");
 
 #  ifdef TIMER_DEBUG
 	fprintf(stderr, "Timer %#jx deleted on thread %d\n", (uintmax_t) EG(timer), (pid_t) syscall(SYS_gettid));

Zend/zend_execute_API.c

@@ -397,8 +397,8 @@ static void zend_timer_settime(zend_long seconds) /* {{{ }*/
 	its.it_value.tv_sec = seconds;
 	its.it_value.tv_nsec = its.it_interval.tv_sec = its.it_interval.tv_nsec = 0;
 
-	int errn = timer_settime(timer, 0, &its, NULL);
-	if (errn != 0) zend_strerror_noreturn(E_ERROR, errn, "Could not set timer");
+	if (timer_settime(timer, 0, &its, NULL) != 0)
+		zend_strerror_noreturn(E_ERROR, errno, "Could not set timer");
 
 # ifdef TIMER_DEBUG
 	fprintf(stderr, "Timer %#jx set on thread %d (%ld seconds)\n", (uintmax_t) timer, (pid_t) syscall(SYS_gettid), seconds);