Changeset 21730 for branches/gcc-kmk/src/kernel32/environ.cpp

Timestamp:

Oct 21, 2011, 4:52:51 PM (14 years ago)

Author:

dmik

Message:

Common compiler warnings and errors.

File:

• branches/gcc-kmk/src/kernel32/environ.cpp (modified) (7 diffs)

branches/gcc-kmk/src/kernel32/environ.cpp

@@ -41 +41 @@
 //list of important OS/2 environment variables that must not be removed
 //when creating a new process
-static char *lpReservedEnvStrings[] = {
+static const char *lpReservedEnvStrings[] = {
 "HOSTNAME",
 "TZ",
@@ -76 +76 @@
   //TEMP is a standard environment variable in Windows, but is not always
   //present in OS/2, so make sure it is.
-  if(GetEnvironmentVariableA("TEMP", szVar, sizeof(szVar)) == 0) 
+  if(GetEnvironmentVariableA("TEMP", szVar, sizeof(szVar)) == 0)
   {
       if(GetEnvironmentVariableA("TMP", szVar, sizeof(szVar)) == 0) {
@@ -226 +226 @@
  *             If the function fails, the return value is zero
  * Remark    :
- * Status    : 
+ * Status    :
  *
  *****************************************************************************/
@@ -254 +254 @@
             if ((p = strchr( src + 1, '%' )) != NULL)
             {
-                len = p - src - 1;  /* Length of the variable name */   
+                len = p - src - 1;  /* Length of the variable name */
                 if ((var = ENV_FindVariable( GetEnvironmentStringsA(),
                                              src + 1, len )) != NULL)
@@ -309 +309 @@
  *             If the function fails, the return value is zero
  * Remark    :
- * Status    : 
+ * Status    :
  *
  *****************************************************************************/
@@ -340 +340 @@
     char *tmpenvnew, *newenv;
     int newsize = 0, len;
-        
+
     dprintf(("New environment:"));
     while(*tmpenvold) {
@@ -374 +374 @@
         tmpenvold += len+1;
     }
+    int i;
     for(i=0;i<sizeof(lpReservedEnvStrings)/sizeof(char *);i++) {
         if(!ENV_FindVariable(lpEnvironment, lpReservedEnvStrings[i], strlen(lpReservedEnvStrings[i]))) {