ruby-changes:17734
From: nobu <ko1@a...>
Date: Thu, 11 Nov 2010 21:30:53 +0900 (JST)
Subject: [ruby-changes:17734] Ruby:r29745 (trunk): * fix type warnings.
nobu 2010-11-11 21:30:39 +0900 (Thu, 11 Nov 2010) New Revision: 29745 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29745 Log: * fix type warnings. Modified files: trunk/ext/socket/ancdata.c trunk/ext/socket/unixsocket.c trunk/ext/syck/rubyext.c trunk/ext/syck/syck.h trunk/ext/win32ole/win32ole.c trunk/include/ruby/ruby.h trunk/vm_dump.c trunk/win32/win32.c Index: include/ruby/ruby.h =================================================================== --- include/ruby/ruby.h (revision 29744) +++ include/ruby/ruby.h (revision 29745) @@ -316,7 +316,7 @@ #define NUM2GIDT(v) NUM2LONG(v) #endif -#define FIX2LONG(x) RSHIFT((SIGNED_VALUE)(x),1) +#define FIX2LONG(x) (long)RSHIFT((SIGNED_VALUE)(x),1) #define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX) #define FIXNUM_P(f) (((SIGNED_VALUE)(f))&FIXNUM_FLAG) #define POSFIXABLE(f) ((f) < FIXNUM_MAX+1) Index: win32/win32.c =================================================================== --- win32/win32.c (revision 29744) +++ win32/win32.c (revision 29745) @@ -3819,8 +3819,6 @@ static int myerrno = 0; if (!pCreateHardLinkW && !myerrno) { - HANDLE hKernel; - pCreateHardLinkW = (BOOL (WINAPI *)(LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES))get_proc_address("kernel32", "CreateHardLinkW", NULL); if (!pCreateHardLinkW) myerrno = ENOSYS; @@ -4936,7 +4934,7 @@ return _pipe(fds, 65536L, _O_NOINHERIT); p = strchr(name, '0'); - snprintf(p, strlen(p) + 1, "%x-%lx", rb_w32_getpid(), serial++); + snprintf(p, strlen(p) + 1, "%"PRI_PIDT_PREFIX"x-%lx", rb_w32_getpid(), serial++); sec.nLength = sizeof(sec); sec.lpSecurityDescriptor = NULL; Index: ext/win32ole/win32ole.c =================================================================== --- ext/win32ole/win32ole.c (revision 29744) +++ ext/win32ole/win32ole.c (revision 29745) @@ -1059,7 +1059,7 @@ ole_wc2mb(LPWSTR pw) { LPSTR pm; - int size = 0; + UINT size = 0; if (conv_51932(cWIN32OLE_cp)) { #ifndef pIMultiLanguage DWORD dw = 0; @@ -1290,7 +1290,7 @@ { rb_encoding *enc; int cp; - int size = 0; + UINT size = 0; LPWSTR pw; st_data_t data; enc = rb_enc_get(vstr); @@ -1316,7 +1316,7 @@ if (conv_51932(cp)) { #ifndef pIMultiLanguage DWORD dw = 0; - int len = RSTRING_LEN(vstr); + UINT len = RSTRING_LENINT(vstr); HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage, &dw, cp, RSTRING_PTR(vstr), &len, NULL, &size); if (FAILED(hr)) { @@ -1341,13 +1341,13 @@ static LPWSTR ole_mb2wc(char *pm, int len) { - int size = 0; + UINT size = 0; LPWSTR pw; if (conv_51932(cWIN32OLE_cp)) { #ifndef pIMultiLanguage DWORD dw = 0; - int n = len; + UINT n = len; HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage, &dw, cWIN32OLE_cp, pm, &n, NULL, &size); if (FAILED(hr)) { @@ -2336,23 +2336,23 @@ { char *pbuf; DWORD dwtype = 0; - LONG size = 0; + DWORD size = 0; VALUE val = Qnil; LONG err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, NULL, &size); if (err == ERROR_SUCCESS) { pbuf = ALLOC_N(char, size + 1); - err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, pbuf, &size); + err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, (BYTE *)pbuf, &size); if (err == ERROR_SUCCESS) { pbuf[size] = '\0'; if (dwtype == REG_EXPAND_SZ) { - char* pbuf2 = pbuf; - DWORD len = ExpandEnvironmentStrings(pbuf2, NULL, 0); - pbuf = ALLOC_N(char, len + 1); - ExpandEnvironmentStrings(pbuf2, pbuf, len + 1); - free(pbuf2); + char* pbuf2 = (char *)pbuf; + DWORD len = ExpandEnvironmentStrings(pbuf2, NULL, 0); + pbuf = ALLOC_N(char, len + 1); + ExpandEnvironmentStrings(pbuf2, pbuf, len + 1); + free(pbuf2); } - val = rb_str_new2(pbuf); + val = rb_str_new2((char *)pbuf); } free(pbuf); } @@ -2574,7 +2574,7 @@ hr = HRESULT_FROM_WIN32(err); else { len = sizeof(clsid); - err = RegQueryValueEx(hpid, (LPBYTE)"", NULL, &dwtype, clsid, &len); + err = RegQueryValueEx(hpid, "", NULL, &dwtype, (BYTE *)clsid, &len); if (err == ERROR_SUCCESS && dwtype == REG_SZ) { pbuf = ole_mb2wc(clsid, -1); hr = CLSIDFromString(pbuf, pclsid); Index: ext/socket/ancdata.c =================================================================== --- ext/socket/ancdata.c (revision 29744) +++ ext/socket/ancdata.c (revision 29745) @@ -1597,7 +1597,7 @@ if (NIL_P(vmaxctllen) && (mh.msg_flags & MSG_CTRUNC)) { #define BIG_ENOUGH_SPACE 65536 if (BIG_ENOUGH_SPACE < maxctllen && - mh.msg_controllen < maxctllen - BIG_ENOUGH_SPACE) { + mh.msg_controllen < (socklen_t)(maxctllen - BIG_ENOUGH_SPACE)) { /* there are big space bug truncated. * file descriptors limit? */ if (!gc_done) { Index: ext/socket/unixsocket.c =================================================================== --- ext/socket/unixsocket.c (revision 29744) +++ ext/socket/unixsocket.c (revision 29745) @@ -339,7 +339,7 @@ rb_sys_fail("recvmsg(2)"); #if FD_PASSING_BY_MSG_CONTROL - if (arg.msg.msg_controllen < sizeof(struct cmsghdr)) { + if (arg.msg.msg_controllen < (socklen_t)sizeof(struct cmsghdr)) { rb_raise(rb_eSocket, "file descriptor was not passed (msg_controllen=%d smaller than sizeof(struct cmsghdr)=%d)", (int)arg.msg.msg_controllen, (int)sizeof(struct cmsghdr)); @@ -354,12 +354,12 @@ "file descriptor was not passed (cmsg_type=%d, %d expected)", cmsg.hdr.cmsg_type, SCM_RIGHTS); } - if (arg.msg.msg_controllen < CMSG_LEN(sizeof(int))) { + if (arg.msg.msg_controllen < (socklen_t)CMSG_LEN(sizeof(int))) { rb_raise(rb_eSocket, "file descriptor was not passed (msg_controllen=%d smaller than CMSG_LEN(sizeof(int))=%d)", (int)arg.msg.msg_controllen, (int)CMSG_LEN(sizeof(int))); } - if (CMSG_SPACE(sizeof(int)) < arg.msg.msg_controllen) { + if ((socklen_t)CMSG_SPACE(sizeof(int)) < arg.msg.msg_controllen) { rb_raise(rb_eSocket, "file descriptor was not passed (msg_controllen=%d bigger than CMSG_SPACE(sizeof(int))=%d)", (int)arg.msg.msg_controllen, (int)CMSG_SPACE(sizeof(int))); Index: ext/syck/rubyext.c =================================================================== --- ext/syck/rubyext.c (revision 29744) +++ ext/syck/rubyext.c (revision 29745) @@ -114,7 +114,7 @@ syck_parser_taguri_expansion( parser, 0 ); oid = syck_parse( parser ); if (!syck_lookup_sym( parser, oid, &data )) { - rb_raise(rb_eSyntaxError, "root node <%lx> not found", oid); + rb_raise(rb_eSyntaxError, "root node <%p> not found", (void *)oid); } sav = data; Index: ext/syck/syck.h =================================================================== --- ext/syck/syck.h (revision 29744) +++ ext/syck/syck.h (revision 29745) @@ -69,7 +69,7 @@ typedef long st_data_t; #endif -#define SYMID unsigned long +#define SYMID st_data_t typedef struct _syck_node SyckNode; Index: vm_dump.c =================================================================== --- vm_dump.c (revision 29744) +++ vm_dump.c (revision 29745) @@ -745,7 +745,7 @@ line.SizeOfStruct = sizeof(line); if (pSymGetLineFromAddr64(ph, addr, NULL, &line)) fprintf(stderr, " %s:%lu", line.FileName, line.LineNumber); - fprintf(stderr, " [0x%"PRIxVALUE"]\n", addr); + fprintf(stderr, " [%p]\n", (void *)(VALUE)addr); } } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/