kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* file.c (rb_file_s_rename): deleted code to get rid of a bug of

Browse source 
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_6@13200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2007-08-22 02:39:03 +00:00
parent 55dc6ed33a
commit f93d2d15e0
10 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/Win32API/Win32API.c
View file

@ -108,7 +108,7 @@ Win32API_initialize(self, dllname, proc, import, export)
} }
if (16 < RARRAY(a_import)->len) { 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); rb_iv_set(self, "__import__", a_import);

5
ext/dl/ptr.c
View file

@ -466,8 +466,9 @@ rb_dlptr_inspect(VALUE self)
char str[1024]; char str[1024];
Data_Get_Struct(self, struct ptr_data, data); Data_Get_Struct(self, struct ptr_data, data);
snprintf(str, 1023, "#<%s:0x%x ptr=0x%x size=%ld free=0x%x>", snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>",
rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free); rb_class2name(CLASS_OF(self)), data, data->ptr, data->size,
(long)data->free);
return rb_str_new2(str); return rb_str_new2(str);
} }

2
ext/dl/sym.c
View file

@ -268,7 +268,7 @@ rb_dlsym_inspect(VALUE self)
str_size = RSTRING(proto)->len + 100; str_size = RSTRING(proto)->len + 100;
str = dlmalloc(str_size); str = dlmalloc(str_size);
snprintf(str, str_size - 1, snprintf(str, str_size - 1,
"#<DL::Symbol:0x%x func=0x%x '%s'>", "#<DL::Symbol:0x%lx func=0x%lx '%s'>",
sym, sym->func, RSTRING(proto)->ptr); sym, sym->func, RSTRING(proto)->ptr);
val = rb_tainted_str_new2(str); val = rb_tainted_str_new2(str);
dlfree(str); dlfree(str);

5
ext/socket/getnameinfo.c
View file

@ -35,6 +35,7 @@
*/ */
#include "config.h" #include "config.h"
#include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#ifndef _WIN32 #ifndef _WIN32
#if defined(__BEOS__) #if defined(__BEOS__)
@ -51,15 +52,11 @@
#endif #endif
#include <netdb.h> #include <netdb.h>
#if defined(HAVE_RESOLV_H) #if defined(HAVE_RESOLV_H)
#ifdef _SX
#include <stdio.h>
#endif
#include <resolv.h> #include <resolv.h>
#endif #endif
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#include <stdio.h>
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif

4
ext/tk/tcltklib.c
View file

@ -4414,13 +4414,13 @@ ip_finalize(ip)
} }
if (Tcl_InterpDeleted(ip)) { if (Tcl_InterpDeleted(ip)) {
DUMP2("ip(%lx) is already deleted", ip); DUMP2("ip(%p) is already deleted", ip);
return; return;
} }
#if TCL_NAMESPACE_DEBUG #if TCL_NAMESPACE_DEBUG
if (ip_null_namespace(ip)) { if (ip_null_namespace(ip)) {
DUMP2("ip(%lx) has null namespace", ip); DUMP2("ip(%p) has null namespace", ip);
return; return;
} }
#endif #endif

17
ext/win32ole/win32ole.c
View file

@ -497,7 +497,7 @@ ole_hresult2msg(hr)
DWORD dwCount; DWORD dwCount;
char strhr[100]; 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); msg = rb_str_new2(strhr);
dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
@ -4033,7 +4033,8 @@ folevariable_name(self)
return rb_ivar_get(self, rb_intern("name")); 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; ITypeInfo *pTypeInfo;
UINT var_index; UINT var_index;
{ {
@ -4077,7 +4078,8 @@ folevariable_ole_type(self)
return ole_variable_ole_type(pvar->pTypeInfo, pvar->index); 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; ITypeInfo *pTypeInfo;
UINT var_index; UINT var_index;
{ {
@ -4113,7 +4115,8 @@ folevariable_ole_type_detail(self)
return ole_variable_ole_type_detail(pvar->pTypeInfo, pvar->index); 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; ITypeInfo *pTypeInfo;
UINT var_index; UINT var_index;
{ {
@ -4159,7 +4162,8 @@ folevariable_value(self)
return ole_variable_value(pvar->pTypeInfo, pvar->index); 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; ITypeInfo *pTypeInfo;
UINT var_index; UINT var_index;
{ {
@ -4631,7 +4635,8 @@ folemethod_visible(self)
return ole_method_visible(pmethod->pTypeInfo, pmethod->index); 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; ITypeInfo *pTypeInfo;
WORD method_index; WORD method_index;
VALUE method_name; VALUE method_name;

18
file.c
View file

@ -2242,18 +2242,12 @@ rb_file_s_rename(klass, from, to)
errno = 0; errno = 0;
#endif #endif
if (rename(src, dst) < 0) { if (rename(src, dst) < 0) {
#if defined __CYGWIN__ #if defined DOSISH && !defined _WIN32
extern unsigned long __attribute__((stdcall)) GetLastError(void); switch (errno) {
if (errno == 0) { /* This is a bug of old Cygwin */ case EEXIST:
/* incorrect as cygwin errno, but the last resort */
errno = GetLastError();
}
#elif defined DOSISH && !defined _WIN32
if (errno == EEXIST
#if defined (__EMX__) #if defined (__EMX__)
|| errno == EACCES case EACCES:
#endif #endif
) {
if (chmod(dst, 0666) == 0 && if (chmod(dst, 0666) == 0 &&
unlink(dst) == 0 && unlink(dst) == 0 &&
rename(src, dst) == 0) rename(src, dst) == 0)
@ -3132,8 +3126,10 @@ rb_file_truncate(obj, len)
# endif # endif
#ifdef __CYGWIN__ #ifdef __CYGWIN__
static int
#include <winerror.h> #include <winerror.h>
extern unsigned long __attribute__((stdcall)) GetLastError(void);
static int
cygwin_flock(int fd, int op) cygwin_flock(int fd, int op)
{ {
int old_errno = errno; int old_errno = errno;

1
intern.h
View file

@ -224,6 +224,7 @@ VALUE rb_thread_local_aref _((VALUE, ID));
VALUE rb_thread_local_aset _((VALUE, ID, VALUE)); VALUE rb_thread_local_aset _((VALUE, ID, VALUE));
void rb_thread_atfork _((void)); void rb_thread_atfork _((void));
VALUE rb_funcall_rescue __((VALUE, ID, int, ...)); VALUE rb_funcall_rescue __((VALUE, ID, int, ...));
VALUE is_ruby_native_thread _((void));
/* file.c */ /* file.c */
VALUE rb_file_s_expand_path _((int, VALUE *)); VALUE rb_file_s_expand_path _((int, VALUE *));
VALUE rb_file_expand_path _((VALUE, VALUE)); VALUE rb_file_expand_path _((VALUE, VALUE));

2
missing/strftime.c
View file

@ -445,7 +445,7 @@ strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr)
} else { } else {
tbuf[0] = '+'; tbuf[0] = '+';
} }
sprintf(tbuf+1, "%02d%02d", off/60, off%60); sprintf(tbuf+1, "%02u%02u", (unsigned)off/60, (unsigned)off%60);
break; break;
#endif /* MAILHEADER_EXT */ #endif /* MAILHEADER_EXT */

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-22" #define RUBY_RELEASE_DATE "2007-08-22"
#define RUBY_VERSION_CODE 186 #define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070822 #define RUBY_RELEASE_CODE 20070822
#define RUBY_PATCHLEVEL 76 #define RUBY_PATCHLEVEL 77
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8