diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-17 13:22:40 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-17 13:22:40 +0000 |
| commit | 0a2053713beb7bfec84d1ef5c024223ed726181f (patch) | |
| tree | 47c25e1da76445d1b51c9547c07af2852e978fda /enc | |
| parent | 6f4fb0981db5cce2a14d38d089c4eb68d0e2a988 (diff) | |
* enc/trans/utf_16_32.c (fun_so_to_utf_16be, fun_so_to_utf_16le): add
parentheses to remove warnings of gcc.
* io.c (rb_io_getc): remove unused variables.
* compile.c (NODE_NEXT, NODE_REDO): remove unused labels.
* ext/nkf/nkf.c (rb_nkf_convert): remove unused variables.
* ext/syck/rubyext.c (syck_resolver_initialize,
syck_resolver_detect_implicit, syck_emitter_emit): remove unused
variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/trans/utf_16_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/enc/trans/utf_16_32.c b/enc/trans/utf_16_32.c index 045dfcdc0a..562e12fbfe 100644 --- a/enc/trans/utf_16_32.c +++ b/enc/trans/utf_16_32.c @@ -45,12 +45,12 @@ fun_so_to_utf_16be(const unsigned char* s, unsigned char* o) return 2; } else if ((s[0]&0xF0)==0xE0) { - o[0] = (s[0]<<4) | (s[1]>>2)^0x20; + o[0] = (s[0]<<4) | ((s[1]>>2)^0x20); o[1] = (s[1]<<6) | (s[2]^0x80); return 2; } else { - int w = (((s[0]&0x07)<<2) | (s[1]>>4)&0x03) - 1; + int w = (((s[0]&0x07)<<2) | ((s[1]>>4)&0x03)) - 1; o[0] = 0xD8 | (w>>2); o[1] = (w<<6) | ((s[1]&0x0F)<<2) | ((s[2]>>4)-8); o[2] = 0xDC | ((s[2]>>2)&0x03); @@ -106,7 +106,7 @@ fun_so_to_utf_16le(const unsigned char* s, unsigned char* o) return 2; } else { - int w = (((s[0]&0x07)<<2) | (s[1]>>4)&0x03) - 1; + int w = (((s[0]&0x07)<<2) | ((s[1]>>4)&0x03)) - 1; o[1] = 0xD8 | (w>>2); o[0] = (w<<6) | ((s[1]&0x0F)<<2) | ((s[2]>>4)-8); o[3] = 0xDC | ((s[2]>>2)&0x03); |