add parentheses, const

ripley · ripley · commit 4a0020cf690b · 2025-03-20T12:54:45.000Z
git-svn-id: https://svn.r-project.org/R/trunk@88011 00db46b3-68df-0310-9c12-caf00c1e9a41
diff --git a/src/main/main.c b/src/main/main.c
@@ -937,9 +937,9 @@ void setup_Rmainloop(void)
       If LANG or LC_ALL has been set to a non-existing locale, we assume
       that the user wants to ne informed. */
 
-    char *s;	
+    const char *s;	
 
-    if (!(s = getenv("LANG") && *s) && !(s = getenv("LC_ALL") && *s))
+    if (!( (s = getenv("LANG")) && *s) && !( (s = getenv("LC_ALL")) && *s))
         setenv("LANG", "C", 1);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -937,9 +937,9 @@ void setup_Rmainloop(void)`
`937`	`937`	`If LANG or LC_ALL has been set to a non-existing locale, we assume`
`938`	`938`	`that the user wants to ne informed. */`
`939`	`939`
`940`		`- char *s;`
	`940`	`+ const char *s;`
`941`	`941`
`942`		`- if (!(s = getenv("LANG") && s) && !(s = getenv("LC_ALL") && s))`
	`942`	`+ if (!( (s = getenv("LANG")) && s) && !( (s = getenv("LC_ALL")) && s))`
`943`	`943`	`setenv("LANG", "C", 1);`
`944`	`944`	`}`
`945`	`945`