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

win32: suppress warnings

Browse source 
* win32/file.c (home_dir, code_page_i): parenthesize to suppress
  warnings.

* win32/win32.c (is_command_com, join_argv, w32_cmdvector, kill),
  (constat_attr_color_reverse, constat_attr): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-24 10:18:35 +00:00
parent 5d77730f69
commit fa13cb050d
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
win32/file.c
View file

@ -63,13 +63,13 @@ home_dir(void)
http://msdn.microsoft.com/en-us/library/windows/desktop/ms683188(v=vs.85).aspx http://msdn.microsoft.com/en-us/library/windows/desktop/ms683188(v=vs.85).aspx
*/ */
if (len = GetEnvironmentVariableW(L"HOME", NULL, 0)) { if ((len = GetEnvironmentVariableW(L"HOME", NULL, 0)) != 0) {
buffer_len = len; buffer_len = len;
home_env = 1; home_env = 1;
} }
else if (len = GetEnvironmentVariableW(L"HOMEDRIVE", NULL, 0)) { else if ((len = GetEnvironmentVariableW(L"HOMEDRIVE", NULL, 0)) != 0) {
buffer_len = len; buffer_len = len;
if (len = GetEnvironmentVariableW(L"HOMEPATH", NULL, 0)) { if ((len = GetEnvironmentVariableW(L"HOMEPATH", NULL, 0)) != 0) {
buffer_len += len; buffer_len += len;
home_env = 2; home_env = 2;
} }
@ -77,7 +77,7 @@ home_dir(void)
buffer_len = 0; buffer_len = 0;
} }
} }
else if (len = GetEnvironmentVariableW(L"USERPROFILE", NULL, 0)) { else if ((len = GetEnvironmentVariableW(L"USERPROFILE", NULL, 0)) != 0) {
buffer_len = len; buffer_len = len;
home_env = 3; home_env = 3;
} }
@ -160,7 +160,7 @@ code_page_i(st_data_t name, st_data_t idx, st_data_t arg)
USHORT *table = cp->table; USHORT *table = cp->table;
if (count <= idx) { if (count <= idx) {
unsigned int i = count; unsigned int i = count;
cp->count = count = ((idx + 4) & ~31 | 28); cp->count = count = (((idx + 4) & ~31) | 28);
cp->table = table = realloc(table, count * sizeof(*table)); cp->table = table = realloc(table, count * sizeof(*table));
while (i < count) table[i++] = INVALID_CODE_PAGE; while (i < count) table[i++] = INVALID_CODE_PAGE;
} }

38
win32/win32.c
View file

@ -930,7 +930,7 @@ is_command_com(const char *interp)
{ {
int i = strlen(interp) - 11; int i = strlen(interp) - 11;
if ((i == 0 || i > 0 && isdirsep(interp[i-1])) && if ((i == 0 || (i > 0 && isdirsep(interp[i-1]))) &&
strcasecmp(interp+i, "command.com") == 0) { strcasecmp(interp+i, "command.com") == 0) {
return 1; return 1;
} }
@ -998,7 +998,7 @@ join_argv(char *cmd, char *const *argv, BOOL escape, UINT cp, int backslash)
char *q, *const *t; char *q, *const *t;
int len, n, bs, quote; int len, n, bs, quote;
for (t = argv, q = cmd, len = 0; p = *t; t++) { for (t = argv, q = cmd, len = 0; (p = *t) != 0; t++) {
quote = 0; quote = 0;
s = p; s = p;
if (!*p || strpbrk(p, " \t\"'")) { if (!*p || strpbrk(p, " \t\"'")) {
@ -1767,7 +1767,7 @@ w32_cmdvector(const WCHAR *cmd, char ***vec, UINT cp, rb_encoding *enc)
buffer = (char *)malloc(len); buffer = (char *)malloc(len);
if (!buffer) { if (!buffer) {
do_nothing: do_nothing:
while (curr = cmdhead) { while ((curr = cmdhead) != 0) {
cmdhead = curr->next; cmdhead = curr->next;
if (curr->flags & NTMALLOC) free(curr->str); if (curr->flags & NTMALLOC) free(curr->str);
free(curr); free(curr);
@ -1793,7 +1793,7 @@ w32_cmdvector(const WCHAR *cmd, char ***vec, UINT cp, rb_encoding *enc)
cptr = buffer + (elements+1) * sizeof(char *); cptr = buffer + (elements+1) * sizeof(char *);
while (curr = cmdhead) { while ((curr = cmdhead) != 0) {
strlcpy(cptr, curr->str, curr->len + 1); strlcpy(cptr, curr->str, curr->len + 1);
*vptr++ = cptr; *vptr++ = cptr;
cptr += curr->len + 1; cptr += curr->len + 1;
@ -4477,7 +4477,7 @@ kill(int pid, int sig)
int ret = 0; int ret = 0;
DWORD err; DWORD err;
if (pid < 0 || pid == 0 && sig != SIGINT) { if (pid < 0 || (pid == 0 && sig != SIGINT)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
@ -5970,9 +5970,9 @@ constat_reset(HANDLE h)
#define BACKGROUND_MASK (BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY) #define BACKGROUND_MASK (BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY)
#define constat_attr_color_reverse(attr) \ #define constat_attr_color_reverse(attr) \
(attr) & ~(FOREGROUND_MASK | BACKGROUND_MASK) | \ ((attr) & ~(FOREGROUND_MASK | BACKGROUND_MASK)) | \
(((attr) & FOREGROUND_MASK) << 4) | \ (((attr) & FOREGROUND_MASK) << 4) | \
(((attr) & BACKGROUND_MASK) >> 4); (((attr) & BACKGROUND_MASK) >> 4)
/* License: Ruby's */ /* License: Ruby's */
static WORD static WORD
@ -6011,27 +6011,27 @@ constat_attr(int count, const int *seq, WORD attr, WORD default_attr, int *rever
break; break;
case 17: case 17:
case 31: case 31:
attr = attr & ~(FOREGROUND_BLUE | FOREGROUND_GREEN) | FOREGROUND_RED; attr = (attr & ~(FOREGROUND_BLUE | FOREGROUND_GREEN)) | FOREGROUND_RED;
break; break;
case 18: case 18:
case 32: case 32:
attr = attr & ~(FOREGROUND_BLUE | FOREGROUND_RED) | FOREGROUND_GREEN; attr = (attr & ~(FOREGROUND_BLUE | FOREGROUND_RED)) | FOREGROUND_GREEN;
break; break;
case 19: case 19:
case 33: case 33:
attr = attr & ~FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED; attr = (attr & ~FOREGROUND_BLUE) | FOREGROUND_GREEN | FOREGROUND_RED;
break; break;
case 20: case 20:
case 34: case 34:
attr = attr & ~(FOREGROUND_GREEN | FOREGROUND_RED) | FOREGROUND_BLUE; attr = (attr & ~(FOREGROUND_GREEN | FOREGROUND_RED)) | FOREGROUND_BLUE;
break; break;
case 21: case 21:
case 35: case 35:
attr = attr & ~FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_RED; attr = (attr & ~FOREGROUND_GREEN) | FOREGROUND_BLUE | FOREGROUND_RED;
break; break;
case 22: case 22:
case 36: case 36:
attr = attr & ~FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN; attr = (attr & ~FOREGROUND_RED) | FOREGROUND_BLUE | FOREGROUND_GREEN;
break; break;
case 23: case 23:
case 37: case 37:
@ -6042,22 +6042,22 @@ constat_attr(int count, const int *seq, WORD attr, WORD default_attr, int *rever
attr &= ~(BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED); attr &= ~(BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED);
break; break;
case 41: case 41:
attr = attr & ~(BACKGROUND_BLUE | BACKGROUND_GREEN) | BACKGROUND_RED; attr = (attr & ~(BACKGROUND_BLUE | BACKGROUND_GREEN)) | BACKGROUND_RED;
break; break;
case 42: case 42:
attr = attr & ~(BACKGROUND_BLUE | BACKGROUND_RED) | BACKGROUND_GREEN; attr = (attr & ~(BACKGROUND_BLUE | BACKGROUND_RED)) | BACKGROUND_GREEN;
break; break;
case 43: case 43:
attr = attr & ~BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED; attr = (attr & ~BACKGROUND_BLUE) | BACKGROUND_GREEN | BACKGROUND_RED;
break; break;
case 44: case 44:
attr = attr & ~(BACKGROUND_GREEN | BACKGROUND_RED) | BACKGROUND_BLUE; attr = (attr & ~(BACKGROUND_GREEN | BACKGROUND_RED)) | BACKGROUND_BLUE;
break; break;
case 45: case 45:
attr = attr & ~BACKGROUND_GREEN | BACKGROUND_BLUE | BACKGROUND_RED; attr = (attr & ~BACKGROUND_GREEN) | BACKGROUND_BLUE | BACKGROUND_RED;
break; break;
case 46: case 46:
attr = attr & ~BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_GREEN; attr = (attr & ~BACKGROUND_RED) | BACKGROUND_BLUE | BACKGROUND_GREEN;
break; break;
case 47: case 47:
attr |= BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED; attr |= BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED;