Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch: const-correctness
Changeset: r66938:abfda92315ef
Date: 2013-09-13 18:17 +0200
http://bitbucket.org/pypy/pypy/changeset/abfda92315ef/
Log: Fix many tests
diff --git a/pypy/module/_minimal_curses/fficurses.py
b/pypy/module/_minimal_curses/fficurses.py
--- a/pypy/module/_minimal_curses/fficurses.py
+++ b/pypy/module/_minimal_curses/fficurses.py
@@ -63,11 +63,11 @@
INT = rffi.INT
INTP = lltype.Ptr(lltype.Array(INT, hints={'nolength':True}))
-c_setupterm = rffi.llexternal('setupterm', [rffi.CCHARP, INT, INTP], INT,
+c_setupterm = rffi.llexternal('setupterm', [rffi.CONST_CCHARP, INT, INTP], INT,
compilation_info=eci)
-c_tigetstr = rffi.llexternal('tigetstr', [rffi.CCHARP], rffi.CCHARP,
+c_tigetstr = rffi.llexternal('tigetstr', [rffi.CONST_CCHARP], rffi.CCHARP,
compilation_info=eci)
-c_tparm = rffi.llexternal('tparm', [rffi.CCHARP, INT, INT, INT, INT, INT,
+c_tparm = rffi.llexternal('tparm', [rffi.CONST_CCHARP, INT, INT, INT, INT, INT,
INT, INT, INT, INT], rffi.CCHARP,
compilation_info=eci)
diff --git a/pypy/module/_multiprocessing/interp_semaphore.py
b/pypy/module/_multiprocessing/interp_semaphore.py
--- a/pypy/module/_multiprocessing/interp_semaphore.py
+++ b/pypy/module/_multiprocessing/interp_semaphore.py
@@ -80,11 +80,11 @@
compilation_info=eci, **kwargs)
_sem_open = external('sem_open',
- [rffi.CCHARP, rffi.INT, rffi.INT, rffi.UINT],
+ [rffi.CONST_CCHARP, rffi.INT, rffi.INT, rffi.UINT],
SEM_T)
# tread sem_close as not threadsafe for now to be able to use the __del__
_sem_close = external('sem_close', [SEM_T], rffi.INT, threadsafe=False)
- _sem_unlink = external('sem_unlink', [rffi.CCHARP], rffi.INT)
+ _sem_unlink = external('sem_unlink', [rffi.CONST_CCHARP], rffi.INT)
_sem_wait = external('sem_wait', [SEM_T], rffi.INT)
_sem_trywait = external('sem_trywait', [SEM_T], rffi.INT)
_sem_post = external('sem_post', [SEM_T], rffi.INT)
diff --git a/rpython/jit/backend/llsupport/test/zrpy_releasegil_test.py
b/rpython/jit/backend/llsupport/test/zrpy_releasegil_test.py
--- a/rpython/jit/backend/llsupport/test/zrpy_releasegil_test.py
+++ b/rpython/jit/backend/llsupport/test/zrpy_releasegil_test.py
@@ -20,7 +20,7 @@
glob = Glob()
#
- c_strchr = rffi.llexternal('strchr', [rffi.CCHARP, lltype.Signed],
+ c_strchr = rffi.llexternal('strchr', [rffi.CONST_CCHARP,
lltype.Signed],
rffi.CCHARP)
def func():
diff --git a/rpython/rtyper/module/ll_os.py b/rpython/rtyper/module/ll_os.py
--- a/rpython/rtyper/module/ll_os.py
+++ b/rpython/rtyper/module/ll_os.py
@@ -258,7 +258,7 @@
'int _noprof_execv(const char *path, char *argv[])',
'return execv(path, argv);')
os_execv = self.llexternal('_noprof_execv',
- [rffi.CONST_CCHARP, rffi.CCHARPP],
+ [rffi.CONST_CCHARP, rffi.CONST_CCHARPP],
rffi.INT, compilation_info = eci)
def execv_llimpl(path, args):
@@ -394,7 +394,7 @@
@registering_str_unicode(os.utime)
def register_os_utime(self, traits):
UTIMBUFP = lltype.Ptr(self.UTIMBUF)
- os_utime = self.llexternal('utime', [rffi.CCHARP, UTIMBUFP], rffi.INT)
+ os_utime = self.llexternal('utime', [rffi.CONST_CCHARP, UTIMBUFP],
rffi.INT)
if not _WIN32:
includes = ['sys/time.h']
@@ -425,7 +425,7 @@
config = platform.configure(CConfig)
TIMEVAL = config['TIMEVAL']
TIMEVAL2P = rffi.CArrayPtr(TIMEVAL)
- os_utimes = self.llexternal('utimes', [rffi.CCHARP, TIMEVAL2P],
+ os_utimes = self.llexternal('utimes', [rffi.CONST_CCHARP,
TIMEVAL2P],
rffi.INT,
compilation_info=CConfig._compilation_info_)
def os_utime_platform(path, actime, modtime):
@@ -1104,7 +1104,7 @@
config = platform.configure(CConfig)
DIRENT = config['DIRENT']
DIRENTP = lltype.Ptr(DIRENT)
- os_opendir = self.llexternal('opendir', [rffi.CCHARP], DIRP,
+ os_opendir = self.llexternal('opendir', [rffi.CONST_CCHARP], DIRP,
compilation_info=compilation_info)
# XXX macro=True is hack to make sure we get the correct kind of
# dirent struct (which depends on defines)
@@ -1206,7 +1206,7 @@
@registering_if(os, 'lchown')
def register_os_lchown(self):
- os_lchown = self.llexternal('lchown',[rffi.CCHARP, rffi.INT, rffi.INT],
+ os_lchown = self.llexternal('lchown',[rffi.CONST_CCHARP, rffi.INT,
rffi.INT],
rffi.INT)
def os_lchown_llimpl(path, uid, gid):
@@ -1233,7 +1233,7 @@
@registering_if(os, 'readlink')
def register_os_readlink(self):
os_readlink = self.llexternal('readlink',
- [rffi.CCHARP, rffi.CCHARP, rffi.SIZE_T],
+ [rffi.CONST_CCHARP, rffi.CCHARP,
rffi.SIZE_T],
rffi.INT)
# XXX SSIZE_T in POSIX.1-2001
@@ -1411,7 +1411,7 @@
@registering_str_unicode(os.rmdir)
def register_os_rmdir(self, traits):
os_rmdir = self.llexternal(traits.posix_function_name('rmdir'),
- [traits.CCHARP], rffi.INT)
+ [traits.CONST_CCHARP], rffi.INT)
def rmdir_llimpl(pathname):
res = rffi.cast(lltype.Signed, os_rmdir(pathname))
@@ -1424,7 +1424,7 @@
@registering_str_unicode(os.chmod)
def register_os_chmod(self, traits):
os_chmod = self.llexternal(traits.posix_function_name('chmod'),
- [traits.CCHARP, rffi.MODE_T], rffi.INT)
+ [traits.CONST_CCHARP, rffi.MODE_T],
rffi.INT)
def chmod_llimpl(path, mode):
res = rffi.cast(lltype.Signed, os_chmod(path,
rffi.cast(rffi.MODE_T, mode)))
@@ -1455,7 +1455,7 @@
@registering_str_unicode(os.rename)
def register_os_rename(self, traits):
os_rename = self.llexternal(traits.posix_function_name('rename'),
- [traits.CCHARP, traits.CCHARP], rffi.INT)
+ [traits.CONST_CCHARP,
traits.CONST_CCHARP], rffi.INT)
def rename_llimpl(oldpath, newpath):
res = rffi.cast(lltype.Signed, os_rename(oldpath, newpath))
@@ -1477,7 +1477,7 @@
@registering_str_unicode(getattr(os, 'mkfifo', None))
def register_os_mkfifo(self, traits):
os_mkfifo = self.llexternal(traits.posix_function_name('mkfifo'),
- [traits.CCHARP, rffi.MODE_T], rffi.INT)
+ [traits.CONST_CCHARP, rffi.MODE_T],
rffi.INT)
def mkfifo_llimpl(path, mode):
res = rffi.cast(lltype.Signed, os_mkfifo(path, mode))
@@ -1490,7 +1490,7 @@
@registering_str_unicode(getattr(os, 'mknod', None))
def register_os_mknod(self, traits):
os_mknod = self.llexternal(traits.posix_function_name('mknod'),
- [traits.CCHARP, rffi.MODE_T, rffi.INT],
+ [traits.CONST_CCHARP, rffi.MODE_T,
rffi.INT],
rffi.INT) # xxx: actually ^^^ dev_t
def mknod_llimpl(path, mode, dev):
@@ -1540,7 +1540,7 @@
@registering_if(os, 'link')
def register_os_link(self):
- os_link = self.llexternal('link', [rffi.CCHARP, rffi.CCHARP],
+ os_link = self.llexternal('link', [rffi.CONST_CCHARP,
rffi.CONST_CCHARP],
rffi.INT)
def link_llimpl(oldpath, newpath):
@@ -1553,7 +1553,7 @@
@registering_if(os, 'symlink')
def register_os_symlink(self):
- os_symlink = self.llexternal('symlink', [rffi.CCHARP, rffi.CCHARP],
+ os_symlink = self.llexternal('symlink', [rffi.CONST_CCHARP,
rffi.CONST_CCHARP],
rffi.INT)
def symlink_llimpl(oldpath, newpath):
diff --git a/rpython/translator/sandbox/rsandbox.py
b/rpython/translator/sandbox/rsandbox.py
--- a/rpython/translator/sandbox/rsandbox.py
+++ b/rpython/translator/sandbox/rsandbox.py
@@ -31,12 +31,12 @@
sandboxsafe=True)
ll_write_not_sandboxed = rffi.llexternal('write',
- [rffi.INT, rffi.CCHARP, rffi.SIZE_T],
+ [rffi.INT, rffi.CONST_CCHARP,
rffi.SIZE_T],
rffi.SIZE_T,
sandboxsafe=True)
-@signature(types.int(), types.ptr(rffi.CCHARP.TO), types.int(),
returns=types.none())
+@signature(types.int(), types.ptr(rffi.CONST_CCHARP.TO), types.int(),
returns=types.none())
def writeall_not_sandboxed(fd, buf, length):
while length > 0:
size = rffi.cast(rffi.SIZE_T, length)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
