From 67991a1af4570832f821e45787ba9abd50e632e8 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 15 Aug 2007 22:41:41 +0000 Subject: * file.c (rb_file_s_rename): deleted code to get rid of a bug of old Cygwin. * file.c (rb_file_truncate): added prototype of GetLastError() on cygwin. [ruby-dev:31239] * intern.h (is_ruby_native_thread): prototype. * missing/strftime.c (strftime): fix printf format and actual arguments. * ext/Win32API/Win32API.c (Win32API_initialize): ditto. * ext/tk/tcltklib.c (ip_finalize): ditto. * ext/dl/ptr.c (rb_dlptr_inspect): ditto. [ruby-dev:31268] * ext/dl/sym.c (rb_dlsym_inspect): ditto. * ext/socket/getnameinfo.c: include stdio.h always. * ext/win32ole/win32ole.c (ole_hresult2msg, folevariable_name, folevariable_ole_type, folevariable_ole_type_detail, folevariable_value, folemethod_visible): missing return value. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@13034 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 27 +++++++++++++++++++++++++++ ext/Win32API/Win32API.c | 2 +- ext/dl/ptr.c | 5 +++-- ext/dl/sym.c | 2 +- ext/socket/getnameinfo.c | 5 +---- ext/tk/tcltklib.c | 4 ++-- ext/win32ole/win32ole.c | 17 +++++++++++------ file.c | 18 +++++++----------- intern.h | 1 + missing/strftime.c | 2 +- version.h | 2 +- 11 files changed, 56 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1666cc0e3a..7c10a8635e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +Thu Aug 16 07:40:41 2007 Nobuyoshi Nakada + + * file.c (rb_file_s_rename): deleted code to get rid of a bug of + old Cygwin. + + * file.c (rb_file_truncate): added prototype of GetLastError() + on cygwin. [ruby-dev:31239] + + * intern.h (is_ruby_native_thread): prototype. + + * missing/strftime.c (strftime): fix printf format and actual + arguments. + + * ext/Win32API/Win32API.c (Win32API_initialize): ditto. + + * ext/tk/tcltklib.c (ip_finalize): ditto. + + * ext/dl/ptr.c (rb_dlptr_inspect): ditto. [ruby-dev:31268] + + * ext/dl/sym.c (rb_dlsym_inspect): ditto. + + * ext/socket/getnameinfo.c: include stdio.h always. + + * ext/win32ole/win32ole.c (ole_hresult2msg, folevariable_name, + folevariable_ole_type, folevariable_ole_type_detail, + folevariable_value, folemethod_visible): missing return value. + Thu Aug 16 07:32:13 2007 Nobuyoshi Nakada * lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c index 96ce8c6636..a4fd0396f0 100644 --- a/ext/Win32API/Win32API.c +++ b/ext/Win32API/Win32API.c @@ -108,7 +108,7 @@ Win32API_initialize(self, dllname, proc, import, export) } if (16 < RARRAY(a_import)->len) { - rb_raise(rb_eRuntimeError, "too many parameters: %d\n", RARRAY(a_import)->len); + rb_raise(rb_eRuntimeError, "too many parameters: %ld\n", RARRAY(a_import)->len); } rb_iv_set(self, "__import__", a_import); diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c index 5c313fad55..574d4241bf 100644 --- a/ext/dl/ptr.c +++ b/ext/dl/ptr.c @@ -466,8 +466,9 @@ rb_dlptr_inspect(VALUE self) char str[1024]; Data_Get_Struct(self, struct ptr_data, data); - snprintf(str, 1023, "#<%s:0x%p ptr=0x%p size=%ld free=0x%p>", - rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free); + snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>", + rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, + (long)data->free); return rb_str_new2(str); } diff --git a/ext/dl/sym.c b/ext/dl/sym.c index 6e4337c0b7..2ca16a8698 100644 --- a/ext/dl/sym.c +++ b/ext/dl/sym.c @@ -268,7 +268,7 @@ rb_dlsym_inspect(VALUE self) str_size = RSTRING(proto)->len + 100; str = dlmalloc(str_size); snprintf(str, str_size - 1, - "#", + "#", sym, sym->func, RSTRING(proto)->ptr); val = rb_tainted_str_new2(str); dlfree(str); diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index 4c9c8f03c4..66f7e8818a 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -35,6 +35,7 @@ */ #include "config.h" +#include #include #ifndef _WIN32 #if defined(__BEOS__) @@ -51,15 +52,11 @@ #endif #include #if defined(HAVE_RESOLV_H) -#ifdef _SX -#include -#endif #include #endif #endif #ifdef _WIN32 #include -#include #define snprintf _snprintf #endif diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 10b79f2970..bad72b4f7f 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -4414,13 +4414,13 @@ ip_finalize(ip) } if (Tcl_InterpDeleted(ip)) { - DUMP2("ip(%lx) is already deleted", ip); + DUMP2("ip(%p) is already deleted", ip); return; } #if TCL_NAMESPACE_DEBUG if (ip_null_namespace(ip)) { - DUMP2("ip(%lx) has null namespace", ip); + DUMP2("ip(%p) has null namespace", ip); return; } #endif diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 9a55708498..e8a68380ae 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -496,7 +496,7 @@ ole_hresult2msg(hr) DWORD dwCount; char strhr[100]; - sprintf(strhr, " HRESULT error code:0x%08x\n ", hr); + sprintf(strhr, " HRESULT error code:0x%08lx\n ", hr); msg = rb_str_new2(strhr); dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | @@ -4032,7 +4032,8 @@ folevariable_name(self) return rb_ivar_get(self, rb_intern("name")); } -static ole_variable_ole_type(pTypeInfo, var_index) +static VALUE +ole_variable_ole_type(pTypeInfo, var_index) ITypeInfo *pTypeInfo; UINT var_index; { @@ -4076,7 +4077,8 @@ folevariable_ole_type(self) return ole_variable_ole_type(pvar->pTypeInfo, pvar->index); } -static ole_variable_ole_type_detail(pTypeInfo, var_index) +static VALUE +ole_variable_ole_type_detail(pTypeInfo, var_index) ITypeInfo *pTypeInfo; UINT var_index; { @@ -4112,7 +4114,8 @@ folevariable_ole_type_detail(self) return ole_variable_ole_type_detail(pvar->pTypeInfo, pvar->index); } -static ole_variable_value(pTypeInfo, var_index) +static VALUE +ole_variable_value(pTypeInfo, var_index) ITypeInfo *pTypeInfo; UINT var_index; { @@ -4158,7 +4161,8 @@ folevariable_value(self) return ole_variable_value(pvar->pTypeInfo, pvar->index); } -static ole_variable_visible(pTypeInfo, var_index) +static VALUE +ole_variable_visible(pTypeInfo, var_index) ITypeInfo *pTypeInfo; UINT var_index; { @@ -4630,7 +4634,8 @@ folemethod_visible(self) return ole_method_visible(pmethod->pTypeInfo, pmethod->index); } -static ole_method_event(pTypeInfo, method_index, method_name) +static VALUE +ole_method_event(pTypeInfo, method_index, method_name) ITypeInfo *pTypeInfo; WORD method_index; VALUE method_name; diff --git a/file.c b/file.c index d492b6ecd7..9724e76b3d 100644 --- a/file.c +++ b/file.c @@ -2236,18 +2236,12 @@ rb_file_s_rename(klass, from, to) errno = 0; #endif if (rename(src, dst) < 0) { -#if defined __CYGWIN__ - extern unsigned long __attribute__((stdcall)) GetLastError(void); - if (errno == 0) { /* This is a bug of old Cygwin */ - /* incorrect as cygwin errno, but the last resort */ - errno = GetLastError(); - } -#elif defined DOSISH && !defined _WIN32 - if (errno == EEXIST +#if defined DOSISH && !defined _WIN32 + switch (errno) { + case EEXIST: #if defined (__EMX__) - || errno == EACCES + case EACCES: #endif - ) { if (chmod(dst, 0666) == 0 && unlink(dst) == 0 && rename(src, dst) == 0) @@ -3118,8 +3112,10 @@ rb_file_truncate(obj, len) # endif #ifdef __CYGWIN__ -static int #include +extern unsigned long __attribute__((stdcall)) GetLastError(void); + +static int cygwin_flock(int fd, int op) { int old_errno = errno; diff --git a/intern.h b/intern.h index 072997503a..fae092ecda 100644 --- a/intern.h +++ b/intern.h @@ -221,6 +221,7 @@ VALUE rb_thread_local_aref _((VALUE, ID)); VALUE rb_thread_local_aset _((VALUE, ID, VALUE)); void rb_thread_atfork _((void)); VALUE rb_funcall_rescue __((VALUE, ID, int, ...)); +VALUE is_ruby_native_thread _((void)); /* file.c */ VALUE rb_file_s_expand_path _((int, VALUE *)); VALUE rb_file_expand_path _((VALUE, VALUE)); diff --git a/missing/strftime.c b/missing/strftime.c index 5522226ec1..970c6c5349 100644 --- a/missing/strftime.c +++ b/missing/strftime.c @@ -445,7 +445,7 @@ strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr) } else { tbuf[0] = '+'; } - sprintf(tbuf+1, "%02d%02d", off/60, off%60); + sprintf(tbuf+1, "%02u%02u", (unsigned)off/60, (unsigned)off%60); break; #endif /* MAILHEADER_EXT */ diff --git a/version.h b/version.h index af412d8393..c6f02741b1 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-16" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 85 +#define RUBY_PATCHLEVEL 86 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.1