Changeset 264 for branches


Ignore:
Timestamp:
Nov 21, 2004, 11:14:36 PM (21 years ago)
Author:
pr
Message:

Fix spelling errors.

Location:
branches/branch-1-0
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/branch-1-0/include/helpers/call_file_dlg.c

    r256 r264  
    44 *      this code contacts XFLDR.DLL to show the
    55 *      XWorkplace file dialog. This does not
    6  *      return until either an error occured
     6 *      return until either an error occurred
    77 *      or XFLDR.DLL has dismissed the dialog,
    88 *      either because the user pressed "OK"

  • branches/branch-1-0/include/helpers/comctl.h

    r229 r264  
    382382     *
    383383     *      --  mp2: pointer to EMPHASISNOTIFY structure.
    384      *          If the double click occured on a chart
     384     *          If the double click occurred on a chart
    385385     *          slice, lIndex has the index of the slice.
    386386     *          Otherwise (e.g. whitespace), lIndex will
    … …  
    449449                // from 0); if -1, a previous emphasis has been undone.
    450450                // With CHTN_CONTEXTMENU and CHTN_ENTER, index of the
    451                 // data item for which the request occured, or -1 for
     451                // data item for which the request occurred, or -1 for
    452452                // a request on the control's whitespace.
    453453        POINTL  ptl;
    454454                // exact window coordinates where mouse
    455                 // click occured (e.g. for context menu).
     455                // click occurred (e.g. for context menu).
    456456                // This is undefined (-1) if the event was not
    457457                // caused by a mouse click.

  • branches/branch-1-0/include/helpers/except.h

    r166 r264  
    205205                    } /* end of TRY block */                                    \
    206206                    else                                                        \
    207                     { /* exception occured: */                                  \
     207                    { /* exception occurred: */                                  \
    208208                        DosUnsetExceptionHandler((PEXCEPTIONREGISTRATIONRECORD)&(excptstruct.RegRec2));
    209209    #endif
    … …  
    214214    #else
    215215        #define END_CATCH()                                                     \
    216                     } /* end of exception-occured block */                      \
     216                    } /* end of exception-occurred block */                      \
    217217                }
    218218    #endif

  • branches/branch-1-0/include/helpers/winh.h

    r256 r264  
    472472     *      have changed (EM_QUERYCHANGED message).
    473473     *
    474      *      This returns TRUE if changes have occured since
     474     *      This returns TRUE if changes have occurred since
    475475     *      the last time this message or WM_QUERYWINDOWPARAMS
    476476     *      (WinQueryWindowText) was received.

  • branches/branch-1-0/include/helpers/xml.h

    r187 r264  
    696696        const char      *pcszErrorDescription;  // error description
    697697        PXSTRING        pxstrSystemID;      // system ID of external entity
    698                                             // where error occured, or NULL
     698                                            // where error occurred, or NULL
    699699                                            // if in main document
    700         ULONG           ulErrorLine;        // line where error occured
    701         ULONG           ulErrorColumn;      // column where error occured
     700        ULONG           ulErrorLine;        // line where error occurred
     701        ULONG           ulErrorColumn;      // column where error occurred
    702702        PXSTRING        pxstrFailingNode;   // element or attribute name
    703703                                            // or NULL

  • branches/branch-1-0/src/helpers/_test_exeh.c

    r209 r264  
    7373        if (arc)
    7474        {
    75             printf("exeh: Error %d occured with \"%s\".\n", arc, argv[1]);
     75            printf("exeh: Error %d occurred with \"%s\".\n", arc, argv[1]);
    7676        }
    7777    }

  • branches/branch-1-0/src/helpers/_test_map.c

    r226 r264  
    9696    else
    9797    {
    98         printf("Error %d occured at line %d\n", rc, ulLineError);
     98        printf("Error %d occurred at line %d\n", rc, ulLineError);
    9999        printf("Line buf: \"%s\"", szLineBuf);
    100100    }

  • branches/branch-1-0/src/helpers/cctl_chart.c

    r222 r264  
    997997 *      paRegions to NULL.
    998998 *
    999  *      This returns NULLHANDLE if an error occured.
     999 *      This returns NULLHANDLE if an error occurred.
    10001000 *      This can mean the following:
    10011001 *

  • branches/branch-1-0/src/helpers/cnrh.c

    r229 r264  
    11881188 *      to remove the source emphasis for preccSource again.
    11891189 *
    1190  *      This function returns FALSE if an error occured.
     1190 *      This function returns FALSE if an error occurred.
    11911191 *
    11921192 *@@added V0.9.0 [umoeller]

  • branches/branch-1-0/src/helpers/dialog.c

    r229 r264  
    32403240    {
    32413241        CHAR szErr[300];
    3242         sprintf(szErr, "Error %d occured in " __FUNCTION__ ".", arc);
     3242        sprintf(szErr, "Error %d occurred in " __FUNCTION__ ".", arc);
    32433243        winhDebugBox(hwndOwner,
    32443244                     "Error in Dialog Manager",
    … …  
    33633363    {
    33643364        CHAR szErr[300];
    3365         sprintf(szErr, "Error %d occured in " __FUNCTION__ ".", arc);
     3365        sprintf(szErr, "Error %d occurred in " __FUNCTION__ ".", arc);
    33663366        winhDebugBox(NULLHANDLE,
    33673367                     "Error in Dialog Manager",

  • branches/branch-1-0/src/helpers/dosh.c

    r229 r264  
    30873087 *
    30883088 *      This returns the APIRET of DosOpen and DosRead.
    3089  *      If any error occured, no buffer was allocated.
     3089 *      If any error occurred, no buffer was allocated.
    30903090 *      Otherwise, you should free() the buffer when
    30913091 *      no longer needed.

  • branches/branch-1-0/src/helpers/dosh2.c

    r229 r264  
    327327 *      also, if one is specified.
    328328 *
    329  *@@changed V0.9.9 (2001-04-04) [umoeller]: this returned an error even if none occured, fixed
     329 *@@changed V0.9.9 (2001-04-04) [umoeller]: this returned an error even if none occurred, fixed
    330330 */
    331331

  • branches/branch-1-0/src/helpers/except.c

    r229 r264  
    5353 +              CATCH(excptid)
    5454 +              {
    55  +                  ....        // exception occured: react here
     55 +                  ....        // exception occurred: react here
    5656 +              } END_CATCH();  // always needed!
    5757 +          } // end of your_func
    … …  
    140140 +
    141141 +              if (fSemOwned)
    142  +                  // this gets executed always, even if an exception occured
     142 +                  // this gets executed always, even if an exception occurred
    143143 +                  DosReleaseMutexSem(hmtx);
    144144 +          } // end of your_func
    … …  
    720720            // *** instruction
    721721
    722             fprintf(file, "Instruction pointer (where exception occured):\n    CS:EIP = %04lX:%08lX  ",
     722            fprintf(file, "Instruction pointer (where exception occurred):\n    CS:EIP = %04lX:%08lX  ",
    723723                    pContextRec->ctx_SegCs,
    724724                    pContextRec->ctx_RegEip);

  • branches/branch-1-0/src/helpers/gpih.c

    r229 r264  
    23222322 *      --  GPI_OK
    23232323 *      --  GPI_HITS: correlate hits
    2324  *      --  GPI_ERROR: error occured (probably either hbmSource not free
     2324 *      --  GPI_ERROR: error occurred (probably either hbmSource not free
    23252325 *                     or no bitmap selected into hpsTarget)
    23262326 *

  • branches/branch-1-0/src/helpers/memdebug_win.c

    r222 r264  
    394394            CHAR        szMsg[1000];
    395395            sprintf(szMsg,
    396                     "Crash occured at object #%d out of %d",
     396                    "Crash occurred at object #%d out of %d",
    397397                    cHeapItems,
    398398                    G_cHeapItems);

  • branches/branch-1-0/src/helpers/prfh2.c

    r229 r264  
    9999    if (fLog)
    100100    {
    101         fprintf(fLog, "    Error occured: %s\n    Return code: %s (%lu)\n",
     101        fprintf(fLog, "    Error occurred: %s\n    Return code: %s (%lu)\n",
    102102                pszErrorString,
    103103                    (ulrc == MBID_ABORT) ? "MBID_ABORT"
    … …  
    127127{
    128128    CHAR szError2[2000];
    129     sprintf(szError2, "An error occured copying the profile %s: \n%s",
     129    sprintf(szError2, "An error occurred copying the profile %s: \n%s",
    130130            pcszINI, pszErrorString);
    131131    return (prfhINIError(ulOptions, fLog, fncbError, szError2));
    … …  
    330330
    331331                if (ulErrorStatus == MBID_IGNORE)
    332                     // error occured, but user pressed "Ignore":
     332                    // error occurred, but user pressed "Ignore":
    333333                    // skip this app
    334334                    ulErrorStatus = MBID_NOERROR;
    … …  
    343343
    344344        } while (ulErrorStatus == MBID_RETRY);
    345     } // end if (ulErrorOccured == MBID_NOERROR)
     345    } // end if (ulErrorOccurred == MBID_NOERROR)
    346346
    347347    if (fLog)
    … …  
    358358    }
    359359
    360     return (ulErrorStatus == MBID_NOERROR); // FALSE if error occured
     360    return (ulErrorStatus == MBID_NOERROR); // FALSE if error occurred
    361361}
    362362
    … …  
    391391    // the following flag may be one of the following:
    392392    //        MBID_NOERROR--- everything's fine, continue
    393     //        MBID_IGNORE --- error occured, but ignore
    394     //        MBID_RETRY  --- error occured, but retry
    395     //        MBID_ABORT  --- error occured, abort saving
    396     ULONG   ulErrorOccured = MBID_IGNORE;
     393    //        MBID_IGNORE --- error occurred, but ignore
     394    //        MBID_RETRY  --- error occurred, but retry
     395    //        MBID_ABORT  --- error occurred, abort saving
     396    ULONG   ulErrorOccurred = MBID_IGNORE;
    397397
    398398    if (fLog)
    … …  
    408408
    409409    if (!brc)
    410         ulErrorOccured = prfhINIError(MB_CANCEL, fLog, fncbError,
     410        ulErrorOccurred = prfhINIError(MB_CANCEL, fLog, fncbError,
    411411                                      "Error querying system profiles size.");
    412412
    413     if (ulErrorOccured == MBID_IGNORE)
     413    if (ulErrorOccurred == MBID_IGNORE)
    414414    {
    415415        Profiles.pszUserName  = (PSZ)malloc(Profiles.cchUserName);
    … …  
    418418             || (Profiles.pszUserName == NULL)
    419419           )
    420             ulErrorOccured = prfhINIError(MB_CANCEL, fLog, fncbError,
     420            ulErrorOccurred = prfhINIError(MB_CANCEL, fLog, fncbError,
    421421                    "Error allocating memory (1).");
    422422    }
    423423
    424     if (ulErrorOccured == MBID_IGNORE)
     424    if (ulErrorOccurred == MBID_IGNORE)
    425425    {
    426426        if (!PrfQueryProfile(hab, &Profiles))
    427             ulErrorOccured = prfhINIError(MB_CANCEL, fLog, fncbError,
     427            ulErrorOccurred = prfhINIError(MB_CANCEL, fLog, fncbError,
    428428                    "Error querying profiles (2).");
    429429    }
    430430
    431     if (ulErrorOccured == MBID_IGNORE)
     431    if (ulErrorOccurred == MBID_IGNORE)
    432432    {
    433433        if (fLog)
    … …  
    463463        {
    464464            // abort, since prfhCopyProfile already has error handling
    465             ulErrorOccured = MBID_ABORT;
     465            ulErrorOccurred = MBID_ABORT;
    466466        }
    467467    }
    468468
    469     if (ulErrorOccured == MBID_IGNORE)
     469    if (ulErrorOccurred == MBID_IGNORE)
    470470    {
    471471        // create OS2.XFL
    … …  
    483483        {
    484484            // abort, since prfhCopyProfile already has error handling
    485             ulErrorOccured = MBID_ABORT;
     485            ulErrorOccurred = MBID_ABORT;
    486486        }
    487487    }
    … …  
    492492     */
    493493
    494     if (ulErrorOccured == MBID_IGNORE)
     494    if (ulErrorOccurred == MBID_IGNORE)
    495495    {
    496496        do
    497497        {
    498             ulErrorOccured = MBID_IGNORE; // if we have a retry in the do-while loop
    499 
    500             if (ulErrorOccured == MBID_IGNORE)
     498            ulErrorOccurred = MBID_IGNORE; // if we have a retry in the do-while loop
     499
     500            if (ulErrorOccurred == MBID_IGNORE)
    501501            {
    502502                // attrib -r -s -h -a OS2SYS.BAK
    … …  
    536536
    537537                if (arc)
    538                     ulErrorOccured = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving original system profile to backup.");
     538                    ulErrorOccurred = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving original system profile to backup.");
    539539            }
    540540
    541             if (ulErrorOccured == MBID_IGNORE)
     541            if (ulErrorOccurred == MBID_IGNORE)
    542542            {
    543543                if (fLog)
    … …  
    548548                    fprintf(fLog, "    rc: %lu\n", arc);
    549549                if (arc)
    550                     ulErrorOccured = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving newly created profile to system profile.");
     550                    ulErrorOccurred = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving newly created profile to system profile.");
    551551            }
    552         } while (ulErrorOccured == MBID_RETRY);
     552        } while (ulErrorOccurred == MBID_RETRY);
    553553    }
    554554
    … …  
    558558     */
    559559
    560     if (ulErrorOccured == MBID_IGNORE)
     560    if (ulErrorOccurred == MBID_IGNORE)
    561561    {
    562562        do
    563563        {
    564             ulErrorOccured = MBID_IGNORE; // if we have a retry in the do-while loop
    565 
    566             if (ulErrorOccured == MBID_IGNORE)
     564            ulErrorOccurred = MBID_IGNORE; // if we have a retry in the do-while loop
     565
     566            if (ulErrorOccurred == MBID_IGNORE)
    567567            {
    568568                // attrib -r -s -h -a OS2.BAK
    … …  
    601601
    602602                if (arc)
    603                     ulErrorOccured = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving original user profile to backup.");
     603                    ulErrorOccurred = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving original user profile to backup.");
    604604            }
    605605
    606             if (ulErrorOccured == MBID_IGNORE)
     606            if (ulErrorOccurred == MBID_IGNORE)
    607607            {
    608608                // move OS2.XFL OS2.INI
    … …  
    616616
    617617                if (arc)
    618                     ulErrorOccured = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving newly created profile to user profile.");
     618                    ulErrorOccurred = prfhINIError(MB_ABORTRETRYIGNORE, fLog, fncbError, "Error moving newly created profile to user profile.");
    619619            }
    620         } while (ulErrorOccured == MBID_RETRY);
     620        } while (ulErrorOccurred == MBID_RETRY);
    621621    }
    622622
    623623    // DosExitCritSec();
    624624
    625     if (ulErrorOccured != MBID_IGNORE)
     625    if (ulErrorOccurred != MBID_IGNORE)
    626626    {
    627627        DosMove(szSysBackup, Profiles.pszSysName);
    … …  
    637637        fprintf(fLog, "  Done with prfhSaveINIs\n");
    638638
    639     if (ulErrorOccured != MBID_IGNORE)
     639    if (ulErrorOccurred != MBID_IGNORE)
    640640        return (999);
    641641    else

  • branches/branch-1-0/src/helpers/syssound.c

    r184 r264  
    389389 *      this sets a system sound in MMPM.INI by
    390390 *      calling sndWriteSoundData.
    391  *      Returns FALSE if an error occured.
     391 *      Returns FALSE if an error occurred.
    392392 *
    393393 *      See sndQuerySystemSound for the parameters.

  • branches/branch-1-0/src/helpers/timer.c

    r222 r264  
    636636 *      with hwnd). Use tmrStopXTimer to stop the timer.
    637637 *
    638  *      Returns 0 if an error occured. It is thus
     638 *      Returns 0 if an error occurred. It is thus
    639639 *      invalid to specify a timer ID of 0.
    640640 *

  • branches/branch-1-0/src/helpers/xml.c

    r252 r264  
    25752575 *      -- ERROR_INVALID_PARAMETER
    25762576 *
    2577  *      -- ERROR_DOM_PARSING: an @expat parsing error occured.
     2577 *      -- ERROR_DOM_PARSING: an @expat parsing error occurred.
    25782578 *         This might also be memory problems.
    25792579 *         With this error code, you will find specific
Note: See TracChangeset for help on using the changeset viewer.