[pypy-commit] pypy more-rposix: Fix after merge

amauryfa noreply at buildbot.pypy.org
Mon Apr 6 10:45:01 CEST 2015


Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: more-rposix
Changeset: r76719:bb2928ec2881
Date: 2015-04-05 01:04 +0200
http://bitbucket.org/pypy/pypy/changeset/bb2928ec2881/

Log:	Fix after merge

diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -1284,10 +1284,7 @@
     if not _WIN32:
         l_tmsbuf = lltype.malloc(TMSP.TO, flavor='raw')
         try:
-            result = c_times(l_tmsbuf)
-            result = rffi.cast(lltype.Signed, result)
-            if result == -1:
-                raise OSError(get_saved_errno(), "times failed")
+            handle_posix_error('times', c_times(l_tmsbuf))
             return (
                 rffi.cast(lltype.Signed, l_tmsbuf.c_tms_utime)
                                                / CLOCK_TICKS_PER_SECOND,
@@ -1323,7 +1320,7 @@
             lltype.free(pexit,   flavor='raw')
             lltype.free(pcreate, flavor='raw')
 
-c_kill = external('kill', [rffi.PID_T, rffi.INT], rffi.INT
+c_kill = external('kill', [rffi.PID_T, rffi.INT], rffi.INT,
                   save_err=rffi.RFFI_SAVE_ERRNO)
 c_killpg = external('killpg', [rffi.INT, rffi.INT], rffi.INT,
                     save_err=rffi.RFFI_SAVE_ERRNO)


More information about the pypy-commit mailing list