[前][次][番号順一覧][スレッド一覧]

ruby-changes:36890

From: nobu <ko1@a...>
Date: Wed, 24 Dec 2014 19:18:45 +0900 (JST)
Subject: [ruby-changes:36890] nobu:r48971 (trunk): win32: suppress warnings

nobu	2014-12-24 19:18:35 +0900 (Wed, 24 Dec 2014)

  New Revision: 48971

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48971

  Log:
    win32: suppress warnings
    
    * 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.

  Modified files:
    trunk/win32/file.c
    trunk/win32/win32.c
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 48970)
+++ win32/win32.c	(revision 48971)
@@ -930,7 +930,7 @@ is_command_com(const char *interp) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L930
 {
     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) {
 	return 1;
     }
@@ -998,7 +998,7 @@ join_argv(char *cmd, char *const *argv, https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L998
     char *q, *const *t;
     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;
 	s = p;
 	if (!*p || strpbrk(p, " \t\"'")) {
@@ -1767,7 +1767,7 @@ w32_cmdvector(const WCHAR *cmd, char *** https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L1767
     buffer = (char *)malloc(len);
     if (!buffer) {
       do_nothing:
-	while (curr = cmdhead) {
+	while ((curr = cmdhead) != 0) {
 	    cmdhead = curr->next;
 	    if (curr->flags & NTMALLOC) free(curr->str);
 	    free(curr);
@@ -1793,7 +1793,7 @@ w32_cmdvector(const WCHAR *cmd, char *** https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L1793
 
     cptr = buffer + (elements+1) * sizeof(char *);
 
-    while (curr = cmdhead) {
+    while ((curr = cmdhead) != 0) {
 	strlcpy(cptr, curr->str, curr->len + 1);
 	*vptr++ = cptr;
 	cptr += curr->len + 1;
@@ -4477,7 +4477,7 @@ kill(int pid, int sig) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L4477
     int ret = 0;
     DWORD err;
 
-    if (pid < 0 || pid == 0 && sig != SIGINT) {
+    if (pid < 0 || (pid == 0 && sig != SIGINT)) {
 	errno = EINVAL;
 	return -1;
     }
@@ -5970,9 +5970,9 @@ constat_reset(HANDLE h) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L5970
 #define BACKGROUND_MASK (BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY)
 
 #define constat_attr_color_reverse(attr) \
-    (attr) & ~(FOREGROUND_MASK | BACKGROUND_MASK) | \
+    ((attr) & ~(FOREGROUND_MASK | BACKGROUND_MASK)) | \
 	   (((attr) & FOREGROUND_MASK) << 4) | \
-	   (((attr) & BACKGROUND_MASK) >> 4);
+	   (((attr) & BACKGROUND_MASK) >> 4)
 
 /* License: Ruby's */
 static WORD
@@ -6011,27 +6011,27 @@ constat_attr(int count, const int *seq, https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L6011
 	    break;
 	  case 17:
 	  case 31:
-	    attr = attr & ~(FOREGROUND_BLUE | FOREGROUND_GREEN) | FOREGROUND_RED;
+	    attr = (attr & ~(FOREGROUND_BLUE | FOREGROUND_GREEN)) | FOREGROUND_RED;
 	    break;
 	  case 18:
 	  case 32:
-	    attr = attr & ~(FOREGROUND_BLUE | FOREGROUND_RED) | FOREGROUND_GREEN;
+	    attr = (attr & ~(FOREGROUND_BLUE | FOREGROUND_RED)) | FOREGROUND_GREEN;
 	    break;
 	  case 19:
 	  case 33:
-	    attr = attr & ~FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
+	    attr = (attr & ~FOREGROUND_BLUE) | FOREGROUND_GREEN | FOREGROUND_RED;
 	    break;
 	  case 20:
 	  case 34:
-	    attr = attr & ~(FOREGROUND_GREEN | FOREGROUND_RED) | FOREGROUND_BLUE;
+	    attr = (attr & ~(FOREGROUND_GREEN | FOREGROUND_RED)) | FOREGROUND_BLUE;
 	    break;
 	  case 21:
 	  case 35:
-	    attr = attr & ~FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_RED;
+	    attr = (attr & ~FOREGROUND_GREEN) | FOREGROUND_BLUE | FOREGROUND_RED;
 	    break;
 	  case 22:
 	  case 36:
-	    attr = attr & ~FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN;
+	    attr = (attr & ~FOREGROUND_RED) | FOREGROUND_BLUE | FOREGROUND_GREEN;
 	    break;
 	  case 23:
 	  case 37:
@@ -6042,22 +6042,22 @@ constat_attr(int count, const int *seq, https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L6042
 	    attr &= ~(BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED);
 	    break;
 	  case 41:
-	    attr = attr & ~(BACKGROUND_BLUE | BACKGROUND_GREEN) | BACKGROUND_RED;
+	    attr = (attr & ~(BACKGROUND_BLUE | BACKGROUND_GREEN)) | BACKGROUND_RED;
 	    break;
 	  case 42:
-	    attr = attr & ~(BACKGROUND_BLUE | BACKGROUND_RED) | BACKGROUND_GREEN;
+	    attr = (attr & ~(BACKGROUND_BLUE | BACKGROUND_RED)) | BACKGROUND_GREEN;
 	    break;
 	  case 43:
-	    attr = attr & ~BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED;
+	    attr = (attr & ~BACKGROUND_BLUE) | BACKGROUND_GREEN | BACKGROUND_RED;
 	    break;
 	  case 44:
-	    attr = attr & ~(BACKGROUND_GREEN | BACKGROUND_RED) | BACKGROUND_BLUE;
+	    attr = (attr & ~(BACKGROUND_GREEN | BACKGROUND_RED)) | BACKGROUND_BLUE;
 	    break;
 	  case 45:
-	    attr = attr & ~BACKGROUND_GREEN | BACKGROUND_BLUE | BACKGROUND_RED;
+	    attr = (attr & ~BACKGROUND_GREEN) | BACKGROUND_BLUE | BACKGROUND_RED;
 	    break;
 	  case 46:
-	    attr = attr & ~BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_GREEN;
+	    attr = (attr & ~BACKGROUND_RED) | BACKGROUND_BLUE | BACKGROUND_GREEN;
 	    break;
 	  case 47:
 	    attr |= BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED;
Index: win32/file.c
===================================================================
--- win32/file.c	(revision 48970)
+++ win32/file.c	(revision 48971)
@@ -63,13 +63,13 @@ home_dir(void) https://github.com/ruby/ruby/blob/trunk/win32/file.c#L63
       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;
 	home_env = 1;
     }
-    else if (len = GetEnvironmentVariableW(L"HOMEDRIVE", NULL, 0)) {
+    else if ((len = GetEnvironmentVariableW(L"HOMEDRIVE", NULL, 0)) != 0) {
 	buffer_len = len;
-	if (len = GetEnvironmentVariableW(L"HOMEPATH", NULL, 0)) {
+	if ((len = GetEnvironmentVariableW(L"HOMEPATH", NULL, 0)) != 0) {
 	    buffer_len += len;
 	    home_env = 2;
 	}
@@ -77,7 +77,7 @@ home_dir(void) https://github.com/ruby/ruby/blob/trunk/win32/file.c#L77
 	    buffer_len = 0;
 	}
     }
-    else if (len = GetEnvironmentVariableW(L"USERPROFILE", NULL, 0)) {
+    else if ((len = GetEnvironmentVariableW(L"USERPROFILE", NULL, 0)) != 0) {
 	buffer_len = len;
 	home_env = 3;
     }
@@ -160,7 +160,7 @@ code_page_i(st_data_t name, st_data_t id https://github.com/ruby/ruby/blob/trunk/win32/file.c#L160
 	    USHORT *table = cp->table;
 	    if (count <= idx) {
 		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));
 		while (i < count) table[i++] = INVALID_CODE_PAGE;
 	    }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]