Changeset 265 for trunk/src/helpers/prfh2.c

Timestamp:

Nov 21, 2004, 11:18:29 PM (21 years ago)

Author:

pr

Message:

Fixed spelling errors.

File:

• trunk/src/helpers/prfh2.c (modified) (17 diffs)

trunk/src/helpers/prfh2.c

@@ -99 +99 @@
     if (fLog)
     {
-        fprintf(fLog, "    Error occured: %s\n    Return code: %s (%lu)\n",
+        fprintf(fLog, "    Error occurred: %s\n    Return code: %s (%lu)\n",
                 pszErrorString,
                     (ulrc == MBID_ABORT) ? "MBID_ABORT"
@@ -127 +127 @@
 {
     CHAR szError2[2000];
-    sprintf(szError2, "An error occured copying the profile %s: \n%s",
+    sprintf(szError2, "An error occurred copying the profile %s: \n%s",
             pcszINI, pszErrorString);
     return prfhINIError(ulOptions, fLog, fncbError, szError2);
@@ -330 +330 @@
 
                 if (ulErrorStatus == MBID_IGNORE)
-                    // error occured, but user pressed "Ignore":
+                    // error occurred, but user pressed "Ignore":
                     // skip this app
                     ulErrorStatus = MBID_NOERROR;
@@ -343 +343 @@
 
         } while (ulErrorStatus == MBID_RETRY);
-    } // end if (ulErrorOccured == MBID_NOERROR)
+    } // end if (ulErrorOccurred == MBID_NOERROR)
 
     if (fLog)
@@ -358 +358 @@
     }
 
-    return (ulErrorStatus == MBID_NOERROR); // FALSE if error occured
+    return (ulErrorStatus == MBID_NOERROR); // FALSE if error occurred
 }
 
@@ -391 +391 @@
     // the following flag may be one of the following:
     //        MBID_NOERROR--- everything's fine, continue
-    //        MBID_IGNORE --- error occured, but ignore
-    //        MBID_RETRY  --- error occured, but retry
-    //        MBID_ABORT  --- error occured, abort saving
-    ULONG   ulErrorOccured = MBID_IGNORE;
+    //        MBID_IGNORE --- error occurred, but ignore
+    //        MBID_RETRY  --- error occurred, but retry
+    //        MBID_ABORT  --- error occurred, abort saving
+    ULONG   ulErrorOccurred = MBID_IGNORE;
 
     if (fLog)
@@ -408 +408 @@
 
     if (!brc)
-        ulErrorOccured = prfhINIError(MB_CANCEL, fLog, fncbError,
+        ulErrorOccurred = prfhINIError(MB_CANCEL, fLog, fncbError,
                                       "Error querying system profiles size.");
 
-    if (ulErrorOccured == MBID_IGNORE)
+    if (ulErrorOccurred == MBID_IGNORE)
     {
         Profiles.pszUserName  = (PSZ)malloc(Profiles.cchUserName);
@@ -418 +418 @@
              || (Profiles.pszUserName == NULL)
            )
-            ulErrorOccured = prfhINIError(MB_CANCEL, fLog, fncbError,
+            ulErrorOccurred = prfhINIError(MB_CANCEL, fLog, fncbError,
                     "Error allocating memory (1).");
     }
 
-    if (ulErrorOccured == MBID_IGNORE)
+    if (ulErrorOccurred == MBID_IGNORE)
     {
         if (!PrfQueryProfile(hab, &Profiles))
-            ulErrorOccured = prfhINIError(MB_CANCEL, fLog, fncbError,
+            ulErrorOccurred = prfhINIError(MB_CANCEL, fLog, fncbError,
                     "Error querying profiles (2).");
     }
 
-    if (ulErrorOccured == MBID_IGNORE)
+    if (ulErrorOccurred == MBID_IGNORE)
     {
         if (fLog)
@@ -463 +463 @@
         {
             // abort, since prfhCopyProfile already has error handling
-            ulErrorOccured = MBID_ABORT;
+            ulErrorOccurred = MBID_ABORT;
         }
     }
 
-    if (ulErrorOccured == MBID_IGNORE)
+    if (ulErrorOccurred == MBID_IGNORE)
     {
         // create OS2.XFL
@@ -483 +483 @@
         {
             // abort, since prfhCopyProfile already has error handling
-            ulErrorOccured = MBID_ABORT;
+            ulErrorOccurred = MBID_ABORT;
         }
     }
@@ -492 +492 @@
      */
 
-    if (ulErrorOccured == MBID_IGNORE)
+    if (ulErrorOccurred == MBID_IGNORE)
     {
         do
         {
-            ulErrorOccured = MBID_IGNORE; // if we have a retry in the do-while loop
-
-            if (ulErrorOccured == MBID_IGNORE)
+            ulErrorOccurred = MBID_IGNORE; // if we have a retry in the do-while loop
+
+            if (ulErrorOccurred == MBID_IGNORE)
             {
                 // attrib -r -s -h -a OS2SYS.BAK
@@ -536 +536 @@
 
                 if (arc)
-                    ulErrorOccured = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving original system profile to backup.");
+                    ulErrorOccurred = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving original system profile to backup.");
             }
 
-            if (ulErrorOccured == MBID_IGNORE)
+            if (ulErrorOccurred == MBID_IGNORE)
             {
                 if (fLog)
@@ -548 +548 @@
                     fprintf(fLog, "    rc: %lu\n", arc);
                 if (arc)
-                    ulErrorOccured = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving newly created profile to system profile.");
+                    ulErrorOccurred = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving newly created profile to system profile.");
             }
-        } while (ulErrorOccured == MBID_RETRY);
+        } while (ulErrorOccurred == MBID_RETRY);
     }
 
@@ -558 +558 @@
      */
 
-    if (ulErrorOccured == MBID_IGNORE)
+    if (ulErrorOccurred == MBID_IGNORE)
     {
         do
         {
-            ulErrorOccured = MBID_IGNORE; // if we have a retry in the do-while loop
-
-            if (ulErrorOccured == MBID_IGNORE)
+            ulErrorOccurred = MBID_IGNORE; // if we have a retry in the do-while loop
+
+            if (ulErrorOccurred == MBID_IGNORE)
             {
                 // attrib -r -s -h -a OS2.BAK
@@ -601 +601 @@
 
                 if (arc)
-                    ulErrorOccured = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving original user profile to backup.");
+                    ulErrorOccurred = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving original user profile to backup.");
             }
 
-            if (ulErrorOccured == MBID_IGNORE)
+            if (ulErrorOccurred == MBID_IGNORE)
             {
                 // move OS2.XFL OS2.INI
@@ -616 +616 @@
 
                 if (arc)
-                    ulErrorOccured = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving newly created profile to user profile.");
+                    ulErrorOccurred = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving newly created profile to user profile.");
             }
-        } while (ulErrorOccured == MBID_RETRY);
+        } while (ulErrorOccurred == MBID_RETRY);
     }
 
     // DosExitCritSec();
 
-    if (ulErrorOccured != MBID_IGNORE)
+    if (ulErrorOccurred != MBID_IGNORE)
     {
         DosMove(szSysBackup, Profiles.pszSysName);
@@ -637 +637 @@
         fprintf(fLog, "  Done with prfhSaveINIs\n");
 
-    if (ulErrorOccured != MBID_IGNORE)
+    if (ulErrorOccurred != MBID_IGNORE)
         return 999;
     else