From fc6402829157928e66019ebca577d51fecf8d179 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 22 Jun 2009 12:23:06 +0000 Subject: [PATCH] * io.c: remove __CHECKER__ test. * dir.c: ditto. * dln.c: ditto. * file.c: ditto. * process.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++++++++++ dir.c | 2 +- dln.c | 6 ------ file.c | 4 +--- io.c | 2 +- process.c | 24 ++++++++++++------------ 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d6962b999..e6a7cb0abd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon Jun 22 21:21:59 2009 Tanaka Akira + + * io.c: remove __CHECKER__ test. + + * dir.c: ditto. + + * dln.c: ditto. + + * file.c: ditto. + + * process.c: ditto. + Mon Jun 22 17:15:38 2009 Yukihiro Matsumoto * ext/stringio/stringio.c (strio_each_codepoint): new method. diff --git a/dir.c b/dir.c index 980b57a283..76c926478b 100644 --- a/dir.c +++ b/dir.c @@ -835,7 +835,7 @@ check_dirname(volatile VALUE *dir) } } -#if defined(HAVE_CHROOT) && !defined(__CHECKER__) +#if defined(HAVE_CHROOT) /* * call-seq: * Dir.chroot( string ) => 0 diff --git a/dln.c b/dln.c index 6e2298df9b..bf5408105a 100644 --- a/dln.c +++ b/dln.c @@ -16,12 +16,6 @@ # include #endif -#ifdef __CHECKER__ -#undef HAVE_DLOPEN -#undef USE_DLN_A_OUT -#undef USE_DLN_DLOPEN -#endif - #ifdef USE_DLN_A_OUT char *dln_argv0; #endif diff --git a/file.c b/file.c index 0b1eef2a79..b1678b9049 100644 --- a/file.c +++ b/file.c @@ -2030,7 +2030,7 @@ rb_file_chown(VALUE obj, VALUE owner, VALUE group) return INT2FIX(0); } -#if defined(HAVE_LCHOWN) && !defined(__CHECKER__) +#if defined(HAVE_LCHOWN) static void lchown_internal(const char *path, void *arg) { @@ -3567,7 +3567,6 @@ rb_thread_flock(void *data) static VALUE rb_file_flock(VALUE obj, VALUE operation) { -#ifndef __CHECKER__ rb_io_t *fptr; int op[2], op1; @@ -3601,7 +3600,6 @@ rb_file_flock(VALUE obj, VALUE operation) rb_sys_fail_path(fptr->pathv); } } -#endif return INT2FIX(0); } #undef flock diff --git a/io.c b/io.c index 9d67bff15e..eebaa09825 100644 --- a/io.c +++ b/io.c @@ -7118,7 +7118,7 @@ rb_io_fcntl(int argc, VALUE *argv, VALUE io) #define rb_io_fcntl rb_f_notimplement #endif -#if defined(HAVE_SYSCALL) && !defined(__CHECKER__) && SIZEOF_LONG == SIZEOF_INT +#if defined(HAVE_SYSCALL) && SIZEOF_LONG == SIZEOF_INT /* * call-seq: * syscall(fixnum [, args...]) => integer diff --git a/process.c b/process.c index c473fe41e7..161e384aa8 100644 --- a/process.c +++ b/process.c @@ -3315,7 +3315,7 @@ proc_setpgrp(void) #endif -#if defined(HAVE_GETPGID) && !defined(__CHECKER__) +#if defined(HAVE_GETPGID) /* * call-seq: * Process.getpgid(pid) => integer @@ -3939,7 +3939,7 @@ proc_setuid(VALUE obj, VALUE id) check_uid_switch(); uid = NUM2UIDT(id); -#if defined(HAVE_SETRESUID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESUID) if (setresuid(uid, -1, -1) < 0) rb_sys_fail(0); #elif defined HAVE_SETREUID if (setreuid(uid, -1) < 0) rb_sys_fail(0); @@ -4318,7 +4318,7 @@ proc_setgid(VALUE obj, VALUE id) check_gid_switch(); gid = NUM2GIDT(id); -#if defined(HAVE_SETRESGID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESGID) if (setresgid(gid, -1, -1) < 0) rb_sys_fail(0); #elif defined HAVE_SETREGID if (setregid(gid, -1) < 0) rb_sys_fail(0); @@ -4794,7 +4794,7 @@ proc_seteuid(VALUE obj, VALUE euid) check_uid_switch(); uid = NUM2UIDT(euid); -#if defined(HAVE_SETRESUID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESUID) if (setresuid(-1, uid, -1) < 0) rb_sys_fail(0); #elif defined HAVE_SETREUID if (setreuid(-1, uid) < 0) rb_sys_fail(0); @@ -4829,7 +4829,7 @@ rb_seteuid_core(rb_uid_t euid) uid = getuid(); -#if defined(HAVE_SETRESUID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESUID) if (uid != euid) { if (setresuid(-1,euid,euid) < 0) rb_sys_fail(0); SAVED_USER_ID = euid; @@ -4914,7 +4914,7 @@ proc_setegid(VALUE obj, VALUE egid) check_gid_switch(); gid = NUM2GIDT(egid); -#if defined(HAVE_SETRESGID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESGID) if (setresgid(-1, gid, -1) < 0) rb_sys_fail(0); #elif defined HAVE_SETREGID if (setregid(-1, gid) < 0) rb_sys_fail(0); @@ -4949,7 +4949,7 @@ rb_setegid_core(rb_gid_t egid) gid = getgid(); -#if defined(HAVE_SETRESGID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESGID) if (gid != egid) { if (setresgid(-1,egid,egid) < 0) rb_sys_fail(0); SAVED_GROUP_ID = egid; @@ -5009,7 +5009,7 @@ p_gid_grant_privilege(VALUE obj, VALUE id) static VALUE p_uid_exchangeable(void) { -#if defined(HAVE_SETRESUID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESUID) return Qtrue; #elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID) return Qtrue; @@ -5041,7 +5041,7 @@ p_uid_exchange(VALUE obj) uid = getuid(); euid = geteuid(); -#if defined(HAVE_SETRESUID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESUID) if (setresuid(euid, uid, uid) < 0) rb_sys_fail(0); SAVED_USER_ID = uid; #elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID) @@ -5066,7 +5066,7 @@ p_uid_exchange(VALUE obj) static VALUE p_gid_exchangeable(void) { -#if defined(HAVE_SETRESGID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESGID) return Qtrue; #elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID) return Qtrue; @@ -5098,7 +5098,7 @@ p_gid_exchange(VALUE obj) gid = getgid(); egid = getegid(); -#if defined(HAVE_SETRESGID) && !defined(__CHECKER__) +#if defined(HAVE_SETRESGID) if (setresgid(egid, gid, gid) < 0) rb_sys_fail(0); SAVED_GROUP_ID = gid; #elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID) @@ -5329,7 +5329,7 @@ p_gid_switch(VALUE obj) #endif -#if defined(HAVE_TIMES) && !defined(__CHECKER__) +#if defined(HAVE_TIMES) /* * call-seq: * Process.times => aStructTms