Changeset 222

Timestamp:

Sep 3, 2002, 8:17:46 PM (23 years ago)

Author:

umoeller

Message:

Minor adjustments for new static handling.

Location:

trunk

Files:

• include/helpers/regexp.h (modified) (1 diff)
• src/helpers/_test_dialog.c (modified) (7 diffs)
• src/helpers/apps.c (modified) (5 diffs)
• src/helpers/cctl_chart.c (modified) (10 diffs)
• src/helpers/cctl_checkcnr.c (modified) (4 diffs)
• src/helpers/cctl_combo.c (modified) (4 diffs)
• src/helpers/cctl_progbar.c (modified) (1 diff)
• src/helpers/cctl_splitwin.c (modified) (3 diffs)
• src/helpers/cctl_tooltip.c (modified) (22 diffs)
• src/helpers/comctl.c (modified) (6 diffs)
• src/helpers/debug.c (modified) (8 diffs)
• src/helpers/dialog.c (modified) (21 diffs)
• src/helpers/dosh.c (modified) (2 diffs)
• src/helpers/dosh2.c (modified) (11 diffs)
• src/helpers/eah.c (modified) (11 diffs)
• src/helpers/encodings.c (modified) (1 diff)
• src/helpers/exeh.c (modified) (10 diffs)
• src/helpers/gpih.c (modified) (2 diffs)
• src/helpers/lan.c (modified) (1 diff)
• src/helpers/level.c (modified) (13 diffs)
• src/helpers/memdebug.c (modified) (4 diffs)
• src/helpers/memdebug_win.c (modified) (5 diffs)
• src/helpers/nls.c (modified) (1 diff)
• src/helpers/nlscache.c (modified) (6 diffs)
• src/helpers/regexp.c (modified) (56 diffs)
• src/helpers/shapewin.c (modified) (15 diffs)
• src/helpers/textv_html.c (modified) (47 diffs)
• src/helpers/textview.c (modified) (32 diffs)
• src/helpers/threads.c (modified) (3 diffs)
• src/helpers/timer.c (modified) (5 diffs)
• src/helpers/tmsgfile.c (modified) (2 diffs)
• src/helpers/tree.c (modified) (5 diffs)
• src/helpers/vcard.c (modified) (15 diffs)
• src/helpers/wphandle.c (modified) (3 diffs)
• src/helpers/xml.c (modified) (22 diffs)
• src/helpers/xmlparse.c (modified) (62 diffs)
• src/helpers/xprf.c (modified) (9 diffs)
• src/helpers/xstring.c (modified) (1 diff)

trunk/include/helpers/regexp.h

@@ -5 +5 @@
 #define BOOLEAN_DEFINED
 typedef int BOOLEAN;
+#ifndef TRUE
 #define TRUE  1
+#endif
+#ifndef FALSE
 #define FALSE 0
+#endif
 #endif
 

trunk/src/helpers/_test_dialog.c

@@ -258 +258 @@
 #define HOTKEY_EF_WIDTH     50
 
-static const CONTROLDEF
+STATIC const CONTROLDEF
     TitleGroup = CONTROLDEF_GROUP("T~itle",
                             ID_XSDI_ICON_TITLE_TEXT,
@@ -450 +450 @@
 #define CX_INTRO   (CX_COL1 + CX_COLDATE + CX_COLTIME + CX_COLSIZE + 6 * COMMON_SPACING)
 
-static CONTROLDEF
+STATIC CONTROLDEF
     ClashIntro = CONTROLDEF_TEXT_WORDBREAK("An object with the title blah already exists in the folder blup.",
                 ID_XFDI_CLASH_TXT1, -100),
@@ -468 +468 @@
     ClashRenameOldEF = CONTROLDEF_ENTRYFIELD("M", ID_XFDI_CLASH_RENAMEOLDTXT, -40, SZL_AUTOSIZE);
 
-static const DLGHITEM dlgTest[] =
+STATIC const DLGHITEM dlgTest[] =
     {
         START_TABLE,
@@ -541 +541 @@
 typedef const struct _XWPENTITY *PCXWPENTITY;
 
-static CHAR     G_szCopyright[5] = "";
-
-static PCSZ     G_pcszBldlevel = "BLDLEVEL_VERSION",
+STATIC CHAR     G_szCopyright[5] = "";
+
+STATIC PCSZ     G_pcszBldlevel = "BLDLEVEL_VERSION",
                 G_pcszBldDate = __DATE__,
                 G_pcszNewLine = "\n",
@@ -553 +553 @@
                 ENTITY_XWORKPLACE = "XWorkplace";
 
-static BOOL     G_fEntitiesHacked = FALSE;
-
-static const XWPENTITY G_aEntities[] =
+STATIC BOOL     G_fEntitiesHacked = FALSE;
+
+STATIC const XWPENTITY G_aEntities[] =
     {
         "©", &G_pcszCopyright,
@@ -567 +567 @@
     };
 
-static PTMFMSGFILE      G_pXWPMsgFile = NULL;        // V0.9.16 (2001-10-08) [umoeller]
+STATIC PTMFMSGFILE      G_pXWPMsgFile = NULL;        // V0.9.16 (2001-10-08) [umoeller]
 
 /*
@@ -610 +610 @@
  */
 
-static ULONG ReplaceEntities(PXSTRING pstr)
+STATIC ULONG ReplaceEntities(PXSTRING pstr)
 {
     ULONG ul,

trunk/src/helpers/apps.c

@@ -804 +804 @@
  */
 
-static APIRET CheckAndQualifyExecutable(PPROGDETAILS pDetails,          // in/out: program details
+STATIC APIRET CheckAndQualifyExecutable(PPROGDETAILS pDetails,          // in/out: program details
                                         PXSTRING pstrExecutablePatched) // in/out: buffer for q'fied exec (must be init'ed)
 {
@@ -859 +859 @@
  */
 
-static APIRET CallBatchCorrectly(PPROGDETAILS pProgDetails,
+STATIC APIRET CallBatchCorrectly(PPROGDETAILS pProgDetails,
                                  PXSTRING pstrExecutablePatched, // in/out: buffer for q'fied exec (must be init'ed)
                                  PXSTRING pstrParams,        // in/out: modified parameters (reallocated)
@@ -979 +979 @@
     return arc;
 }
-
-#ifdef _PMPRINTF_
-
-static void DumpMemoryBlock(PBYTE pb,       // in: start address
-                     ULONG ulSize,   // in: size of block
-                     ULONG ulIndent) // in: how many spaces to put
-                                     //     before each output line
-{
-    TRY_QUIET(excpt1)
-    {
-        PBYTE   pbCurrent = pb;                 // current byte
-        ULONG   ulCount = 0,
-                ulCharsInLine = 0;              // if this grows > 7, a new line is started
-        CHAR    szTemp[1000];
-        CHAR    szLine[400] = "",
-                szAscii[30] = "         ";      // ASCII representation; filled for every line
-        PSZ     pszLine = szLine,
-                pszAscii = szAscii;
-
-        for (pbCurrent = pb;
-             ulCount < ulSize;
-             pbCurrent++, ulCount++)
-        {
-            if (ulCharsInLine == 0)
-            {
-                memset(szLine, ' ', ulIndent);
-                pszLine += ulIndent;
-            }
-            pszLine += sprintf(pszLine, "%02lX ", (ULONG)*pbCurrent);
-
-            if ( (*pbCurrent > 31) && (*pbCurrent < 127) )
-                // printable character:
-                *pszAscii = *pbCurrent;
-            else
-                *pszAscii = '.';
-            pszAscii++;
-
-            ulCharsInLine++;
-            if (    (ulCharsInLine > 7)         // 8 bytes added?
-                 || (ulCount == ulSize-1)       // end of buffer reached?
-               )
-            {
-                // if we haven't had eight bytes yet,
-                // fill buffer up to eight bytes with spaces
-                ULONG   ul2;
-                for (ul2 = ulCharsInLine;
-                     ul2 < 8;
-                     ul2++)
-                    pszLine += sprintf(pszLine, "   ");
-
-                sprintf(szTemp, "%04lX:  %s  %ss",
-                                (ulCount & 0xFFFFFFF8),  // offset in hex
-                                szLine,         // bytes string
-                                szAscii);       // ASCII string
-
-                _Pmpf(("%s", szTemp));
-
-                // restart line buffer
-                pszLine = szLine;
-
-                // clear ASCII buffer
-                strcpy(szAscii, "         ");
-                pszAscii = szAscii;
-
-                // reset line counter
-                ulCharsInLine = 0;
-            }
-        }
-
-    }
-    CATCH(excpt1)
-    {
-        _Pmpf(("Crash in " __FUNCTION__ ));
-    } END_CATCH();
-}
-
-#endif
 
 /*
@@ -1599 +1522 @@
  */
 
-static APIRET CallDosStartSession(HAPP *phapp,
+STATIC APIRET CallDosStartSession(HAPP *phapp,
                                   const PROGDETAILS *pNewProgDetails, // in: program spec (req.)
                                   ULONG cbFailingName,
@@ -1754 +1677 @@
  */
 
-static APIRET CallWinStartApp(HAPP *phapp,            // out: application handle if NO_ERROR is returned
+STATIC APIRET CallWinStartApp(HAPP *phapp,            // out: application handle if NO_ERROR is returned
                               HWND hwndNotify,        // in: notify window or NULLHANDLE
                               const PROGDETAILS *pcProgDetails, // in: program spec (req.)

trunk/src/helpers/cctl_chart.c

@@ -281 +281 @@
  */
 
-static VOID DrawCenteredText(HPS hpsMem,
+STATIC VOID DrawCenteredText(HPS hpsMem,
                              PPOINTL pptlMiddlePoint,
                              const char *pcsz)
@@ -354 +354 @@
  */
 
-static VOID PaintBarChart(HPS hpsMem,
+STATIC VOID PaintBarChart(HPS hpsMem,
                           PRECTL prclWholeStatic,    // in: rectl to paint into
                           PCHARTDATA pChartData,     // in: chart data
@@ -557 +557 @@
  */
 
-static VOID PaintPieChart(HPS hpsMem,
+STATIC VOID PaintPieChart(HPS hpsMem,
                           PRECTL prclWholeStatic,    // in: rectl to paint into
                           PCHARTDATA pChartData,     // in: chart data
@@ -1096 +1096 @@
  */
 
-static VOID CleanupBitmap(PCHARTCDATA pChtCData)
+STATIC VOID CleanupBitmap(PCHARTCDATA pChtCData)
 {
     if (pChtCData)
@@ -1151 +1151 @@
  */
 
-static VOID CleanupData(PCHARTCDATA pChtCData)
+STATIC VOID CleanupData(PCHARTCDATA pChtCData)
 {
     if (pChtCData)
@@ -1203 +1203 @@
  */
 
-static VOID SetChartData(HWND hwndChart,
+STATIC VOID SetChartData(HWND hwndChart,
                          PCHARTCDATA pChtCData,
                          PCHARTDATA pcdNew)
@@ -1274 +1274 @@
  */
 
-static VOID PaintChart(HWND hwndChart,
+STATIC VOID PaintChart(HWND hwndChart,
                        PCHARTCDATA pChtCData,
                        HPS hps,
@@ -1451 +1451 @@
  */
 
-static LONG FindItemFromPoint(PCHARTCDATA pChtCData,
+STATIC LONG FindItemFromPoint(PCHARTCDATA pChtCData,
                               LONG lx,
                               LONG ly)
@@ -1490 +1490 @@
  */
 
-static VOID SendWMControl(HWND hwndChart,
+STATIC VOID SendWMControl(HWND hwndChart,
                           MPARAM mp1Mouse,
                           USHORT usNotify,
@@ -1522 +1522 @@
  */
 
-static BOOL SetEmphasis(HWND hwndChart,
+STATIC BOOL SetEmphasis(HWND hwndChart,
                         PCHARTCDATA pChtCData,
                         ULONG ulEmphasis,      // in: 0 == selection, 1 == source emphasis

trunk/src/helpers/cctl_checkcnr.c

@@ -193 +193 @@
  */
 
-static VOID CnrCheckboxClicked(PCHECKBOXCNROWNER pcbco,
+STATIC VOID CnrCheckboxClicked(PCHECKBOXCNROWNER pcbco,
                                PCHECKBOXRECORDCORE precc,
                                BOOL fToggleAndNotify) // if TRUE, toggle state and notify owner (CN_RECORDCHECKED)
@@ -359 +359 @@
  */
 
-static MRESULT EXPENTRY fnwpSubclCheckboxCnr(HWND hwndCnr, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY fnwpSubclCheckboxCnr(HWND hwndCnr, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     MRESULT             mrc = 0;
@@ -593 +593 @@
  */
 
-static MRESULT EXPENTRY fnwpSubclCheckboxCnrOwner(HWND hwndOwner, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY fnwpSubclCheckboxCnrOwner(HWND hwndOwner, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     MRESULT             mrc = 0;
@@ -872 +872 @@
  */
 
-static ULONG EXPENTRY fncbFindCheckRecord(HWND hwndCnr,             // in: container
+STATIC ULONG EXPENTRY fncbFindCheckRecord(HWND hwndCnr,             // in: container
                                           PRECORDCORE preccThis,    // in: current record (from cnrhForAllRecords)
                                           ULONG ulItemID,           // in: item ID to find

trunk/src/helpers/cctl_combo.c

@@ -125 +125 @@
  */
 
-static VOID PaintButtonBitmap(HWND hwnd,
+STATIC VOID PaintButtonBitmap(HWND hwnd,
                               PCOMBODATA pcd)
 {
@@ -157 +157 @@
  */
 
-static MRESULT EXPENTRY fnwpSubclassedComboButton(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY fnwpSubclassedComboButton(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     MRESULT mrc = 0;
@@ -193 +193 @@
  */
 
-static VOID ShowListbox(HWND hwnd,      // in: subclassed entry field
+STATIC VOID ShowListbox(HWND hwnd,      // in: subclassed entry field
                         PCOMBODATA pcd,
                         BOOL fShow)    // in: TRUE == show, FALSE == hide
@@ -261 +261 @@
  */
 
-static MRESULT EXPENTRY fnwpComboSubclass(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY fnwpComboSubclass(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     MRESULT     mrc = 0;

trunk/src/helpers/cctl_progbar.c

@@ -101 +101 @@
  */
 
-static VOID PaintProgress(PPROGRESSBARDATA pData,
+STATIC VOID PaintProgress(PPROGRESSBARDATA pData,
                           HWND hwndBar,
                           PRECTL prclWin,      // in: window rectangle (WinQueryWindowRect)

trunk/src/helpers/cctl_splitwin.c

@@ -98 +98 @@
  */
 
-static VOID PaintSplitWindow(HWND hwndSplit)
+STATIC VOID PaintSplitWindow(HWND hwndSplit)
 {
     HPS hps;
@@ -276 +276 @@
  */
 
-static VOID TrackSplitBar(HWND hwndBar,
+STATIC VOID TrackSplitBar(HWND hwndBar,
                           PSPLITBARDATA pData)
 {
@@ -425 +425 @@
  */
 
-static VOID PaintSplitBar(HWND hwndBar,
+STATIC VOID PaintSplitBar(HWND hwndBar,
                           PSPLITBARDATA pData)
 {

trunk/src/helpers/cctl_tooltip.c

@@ -135 +135 @@
  */
 
-static BOOL LockSubclassedTools(VOID)
+STATIC BOOL LockSubclassedTools(VOID)
 {
     if (!G_hmtxSubclassedTools)
@@ -163 +163 @@
  */
 
-static VOID UnlockSubclassedTools(VOID)
+STATIC VOID UnlockSubclassedTools(VOID)
 {
     DosReleaseMutexSem(G_hmtxSubclassedTools);      // was missing V0.9.12 (2001-05-03) [umoeller]
@@ -196 +196 @@
  */
 
-static PSUBCLASSEDTOOL FindSubclassedTool(HWND hwndTool)
+STATIC PSUBCLASSEDTOOL FindSubclassedTool(HWND hwndTool)
 {
     PLISTNODE pNode = lstQueryFirstNode(&G_llSubclassedTools);
@@ -284 +284 @@
  */
 
-static BOOL SubclassTool(HWND hwndTooltip,
+STATIC BOOL SubclassTool(HWND hwndTooltip,
                          HWND hwndTool)
 {
@@ -324 +324 @@
  */
 
-static BOOL UnSubclassTool(HWND hwndTool)
+STATIC BOOL UnSubclassTool(HWND hwndTool)
 {
     PSUBCLASSEDTOOL pst;
@@ -405 +405 @@
  */
 
-static VOID UpdateTooltipPresColors(HWND hwndTooltip)      // in: tooltip control
+STATIC VOID UpdateTooltipPresColors(HWND hwndTooltip)      // in: tooltip control
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -438 +438 @@
  */
 
-static MRESULT TtmCreate(HWND hwndTooltip,
+STATIC MRESULT TtmCreate(HWND hwndTooltip,
                          MPARAM mp2)
 {
@@ -508 +508 @@
  */
 
-static BOOL TtmTimer(HWND hwndTooltip, MPARAM mp1)
+STATIC BOOL TtmTimer(HWND hwndTooltip, MPARAM mp1)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -551 +551 @@
  */
 
-static VOID TtmPaint(HWND hwndTooltip)
+STATIC VOID TtmPaint(HWND hwndTooltip)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -643 +643 @@
  */
 
-static VOID TtmDestroy(HWND hwndTooltip)
+STATIC VOID TtmDestroy(HWND hwndTooltip)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -689 +689 @@
  */
 
-static MRESULT TtmAddTool(HWND hwndTooltip, MPARAM mp2)
+STATIC MRESULT TtmAddTool(HWND hwndTooltip, MPARAM mp2)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -730 +730 @@
  */
 
-static VOID TtmDelTool(HWND hwndTooltip, MPARAM mp2)
+STATIC VOID TtmDelTool(HWND hwndTooltip, MPARAM mp2)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -779 +779 @@
  */
 
-static VOID TtmRelayEvent(HWND hwndTooltip, MPARAM mp2)
+STATIC VOID TtmRelayEvent(HWND hwndTooltip, MPARAM mp2)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -856 +856 @@
  */
 
-static MRESULT TtmGetDelayTime(HWND hwndTooltip, MPARAM mp1)
+STATIC MRESULT TtmGetDelayTime(HWND hwndTooltip, MPARAM mp1)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -881 +881 @@
  */
 
-static VOID TtmSetDelayTime(HWND hwndTooltip, MPARAM mp1, MPARAM mp2)
+STATIC VOID TtmSetDelayTime(HWND hwndTooltip, MPARAM mp1, MPARAM mp2)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -914 +914 @@
  */
 
-static VOID TtmGetText(HWND hwndTooltip, MPARAM mp2)
+STATIC VOID TtmGetText(HWND hwndTooltip, MPARAM mp2)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -957 +957 @@
  */
 
-static MRESULT TtmEnumTools(HWND hwndTooltip, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT TtmEnumTools(HWND hwndTooltip, MPARAM mp1, MPARAM mp2)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -982 +982 @@
  */
 
-static MRESULT TtmGetCurrentTool(HWND hwndTooltip, MPARAM mp2)
+STATIC MRESULT TtmGetCurrentTool(HWND hwndTooltip, MPARAM mp2)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -1005 +1005 @@
  */
 
-static MRESULT TtmGetToolInfo(HWND hwndTooltip, MPARAM mp2)
+STATIC MRESULT TtmGetToolInfo(HWND hwndTooltip, MPARAM mp2)
 {
     PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
@@ -1044 +1044 @@
  */
 
-static VOID FormatTooltip(HWND hwndTooltip,
+STATIC VOID FormatTooltip(HWND hwndTooltip,
                           PTOOLTIPDATA pttd,
                           PPOINTL pptlPointer)      // in: current pointer pos or NULL
@@ -1164 +1164 @@
  */
 
-static VOID TtmUpdateTipText(HWND hwndTooltip,
+STATIC VOID TtmUpdateTipText(HWND hwndTooltip,
                              const char *pcszNewText)
 {
@@ -1214 +1214 @@
  */
 
-static VOID TtmShowTooltip(HWND hwndTooltip,
+STATIC VOID TtmShowTooltip(HWND hwndTooltip,
                            BOOL fShow)  // if TRUE: show, else: HIDE
 {

trunk/src/helpers/comctl.c

@@ -133 +133 @@
  */
 
-static MRESULT EXPENTRY fnwpSeparatorLine(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY fnwpSeparatorLine(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     MRESULT mrc = 0;
@@ -1074 +1074 @@
  */
 
-static PANIMATIONDATA CreateAnimationData(HAB hab,
+STATIC PANIMATIONDATA CreateAnimationData(HAB hab,
                                           HWND hwndStatic,
                                           USHORT cAnimations)
@@ -1535 +1535 @@
  ********************************************************************/
 
-static PFNWP G_pfnwpOrigStatic = NULL;
+STATIC PFNWP G_pfnwpColorRectOrigStatic = NULL;
 
 /*
@@ -1557 +1557 @@
  */
 
-static MRESULT EXPENTRY ctl_fnwpSubclassedColorRect(HWND hwndStatic, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY ctl_fnwpSubclassedColorRect(HWND hwndStatic, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     MRESULT mrc = 0;
@@ -1638 +1638 @@
 
         default:
-            mrc = G_pfnwpOrigStatic(hwndStatic, msg, mp1, mp2);
+            mrc = G_pfnwpColorRectOrigStatic(hwndStatic, msg, mp1, mp2);
         break;
     }
@@ -1659 +1659 @@
                                   ctl_fnwpSubclassedColorRect))
     {
-        G_pfnwpOrigStatic = pfnwp;
+        G_pfnwpColorRectOrigStatic = pfnwp;
         return TRUE;
     }

trunk/src/helpers/debug.c

@@ -100 +100 @@
 // this specifies whether we're dealing with 32-bit code;
 // this gets changed whenever 16-bit count is detected
-static BOOL     f32bit = TRUE;
+STATIC BOOL     f32bit = TRUE;
 
 /*
@@ -363 +363 @@
  ********************************************************************/
 
-static int Read16CodeView(FILE *LogFile, PXDEBUGINFO pxdi, int fh, int TrapSeg, int TrapOff, CHAR *FileName);
-static int Read32PmDebug(FILE *LogFile, PXDEBUGINFO pxdi, int fh, int TrapSeg, int TrapOff, CHAR *FileName);
+STATIC int Read16CodeView(FILE *LogFile, PXDEBUGINFO pxdi, int fh, int TrapSeg, int TrapOff, CHAR *FileName);
+STATIC int Read32PmDebug(FILE *LogFile, PXDEBUGINFO pxdi, int fh, int TrapSeg, int TrapOff, CHAR *FileName);
 
 /*
@@ -385 +385 @@
  */
 
-static VOID WriteDebugInfo(FILE *LogFile,              // in: open log file
+STATIC VOID WriteDebugInfo(FILE *LogFile,              // in: open log file
                            PXDEBUGINFO pxdi)           // in: debug info
 {
@@ -618 +618 @@
  */
 
-static int Read32PmDebug(FILE *LogFile,        // in: text log file to write to
+STATIC int Read32PmDebug(FILE *LogFile,        // in: text log file to write to
                          PXDEBUGINFO pxdi,
                          int ModuleFile,       // in: module file opened with sopen()
@@ -1050 +1050 @@
  */
 
-static int Read16CodeView(FILE *LogFile,       // in: text log file to write to
+STATIC int Read16CodeView(FILE *LogFile,       // in: text log file to write to
                           PXDEBUGINFO pxdi,
                           int fh,
@@ -1215 +1215 @@
  */
 
-static VOID var_value(void *varptr,        // in: address of the variable on the stack
+STATIC VOID var_value(void *varptr,        // in: address of the variable on the stack
                       char *pszBuf,        // out: information
                       BYTE type)           // in: type; if >= 32, we'll call DosQueryMem
@@ -1299 +1299 @@
  */
 
-static BOOL search_userdefs(FILE *LogFile,     // in: text log file to write to
+STATIC BOOL search_userdefs(FILE *LogFile,     // in: text log file to write to
                             ULONG stackofs,
                             USHORT var_no)
@@ -1343 +1343 @@
  */
 
-static BOOL search_pointers(FILE *LogFile,     // in: text log file to write to
+STATIC BOOL search_pointers(FILE *LogFile,     // in: text log file to write to
                             ULONG stackofs,
                             USHORT var_no)

trunk/src/helpers/dialog.c

@@ -754 +754 @@
 #ifdef DEBUG_DIALOG_WINDOWS
 
-static PFNWP G_pfnwpDebugStaticOrig = NULL;
+STATIC PFNWP G_pfnwpDebugStaticOrig = NULL;
 
 /*
@@ -770 +770 @@
  */
 
-static MRESULT EXPENTRY fnwpDebugFrame(HWND hwndBox, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY fnwpDebugFrame(HWND hwndBox, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     MRESULT mrc = 0;
@@ -871 +871 @@
 // forward declaration so we can recurse into tables from columns
 
-static APIRET ProcessTable(PTABLEDEF pTableDef,
+STATIC APIRET ProcessTable(PTABLEDEF pTableDef,
                            const CONTROLPOS *pcpTableBox,
                            enProcessMode ProcessMode,
@@ -889 +889 @@
  */
 
-static VOID SetDlgFont(PCSZ pcszFontThis,
+STATIC VOID SetDlgFont(PCSZ pcszFontThis,
                        PDLGPRIVATE pDlgData)
 {
@@ -952 +952 @@
  */
 
-static APIRET CalcAutoSizeTextSingle(PCOLUMNDEF pColumn,
+STATIC APIRET CalcAutoSizeTextSingle(PCOLUMNDEF pColumn,
                                      PDLGPRIVATE pDlgData)
 {
@@ -987 +987 @@
  */
 
-static APIRET CalcAutoSizeTextMulti(PCOLUMNDEF pColumn,
+STATIC APIRET CalcAutoSizeTextMulti(PCOLUMNDEF pColumn,
                                     ULONG ulWidth,            // in: proposed width of control (req.)
                                     PDLGPRIVATE pDlgData)
@@ -1033 +1033 @@
  */
 
-static APIRET CalcAutoSizeTextView(PCOLUMNDEF pColumn,
+STATIC APIRET CalcAutoSizeTextView(PCOLUMNDEF pColumn,
                                    ULONG ulWidth,            // in: proposed width of control (req.)
                                    PDLGPRIVATE pDlgData)
@@ -1109 +1109 @@
  */
 
-static APIRET CalcAutoSize(PCOLUMNDEF pColumn,
+STATIC APIRET CalcAutoSize(PCOLUMNDEF pColumn,
                            ULONG ulWidth,            // in: proposed width of control
                            PDLGPRIVATE pDlgData)
@@ -1227 +1227 @@
  */
 
-static APIRET ColumnCalcPositions(PCOLUMNDEF pColumn,
+STATIC APIRET ColumnCalcPositions(PCOLUMNDEF pColumn,
                                   PROWDEF pOwningRow,          // in: current row from ProcessRow
                                   PLONG plX,                   // in/out: PROCESS_6_CALC_POSITIONS only
@@ -1294 +1294 @@
  */
 
-static APIRET ColumnCreateControl(PCOLUMNDEF pColumn,
+STATIC APIRET ColumnCreateControl(PCOLUMNDEF pColumn,
                                   PDLGPRIVATE pDlgData)
 {
@@ -1637 +1637 @@
  */
 
-static APIRET ProcessColumn(PCOLUMNDEF pColumn,
+STATIC APIRET ProcessColumn(PCOLUMNDEF pColumn,
                             PROWDEF pOwningRow,          // in: current row from ProcessRow
                             enProcessMode ProcessMode,     // in: processing mode (see ProcessAll)
@@ -2104 +2104 @@
  */
 
-static APIRET ProcessRow(PROWDEF pRowDef,
+STATIC APIRET ProcessRow(PROWDEF pRowDef,
                          PTABLEDEF pOwningTable,     // in: current table from ProcessTable
                          enProcessMode ProcessMode,    // in: processing mode (see ProcessAll)
@@ -2202 +2202 @@
  */
 
-static APIRET ProcessTable(PTABLEDEF pTableDef,
+STATIC APIRET ProcessTable(PTABLEDEF pTableDef,
                            const CONTROLPOS *pcpTableBox,   // in: table position with PROCESS_6_CALC_POSITIONS
                            enProcessMode ProcessMode,         // in: processing mode (see ProcessAll)
@@ -2330 +2330 @@
  */
 
-static APIRET ProcessAll(PDLGPRIVATE pDlgData,
+STATIC APIRET ProcessAll(PDLGPRIVATE pDlgData,
                          enProcessMode ProcessMode)
 {
@@ -2396 +2396 @@
  */
 
-static APIRET CreateColumn(PDLGPRIVATE pDlgData,
+STATIC APIRET CreateColumn(PDLGPRIVATE pDlgData,
                            PROWDEF pCurrentRow,
                            PTABLEDEF pNestedTable,
@@ -2512 +2512 @@
  */
 
-static VOID FreeTable(PTABLEDEF pTable)
+STATIC VOID FreeTable(PTABLEDEF pTable)
 {
     // for each table, clean up the rows
@@ -2561 +2561 @@
  */
 
-static APIRET Dlg0_Init(PDLGPRIVATE *ppDlgData,
+STATIC APIRET Dlg0_Init(PDLGPRIVATE *ppDlgData,
                         PCSZ pcszControlsFont,
                         PLINKLIST pllControls)
@@ -2617 +2617 @@
  */
 
-static APIRET Dlg1_ParseTables(PDLGPRIVATE pDlgData,
+STATIC APIRET Dlg1_ParseTables(PDLGPRIVATE pDlgData,
                                PCDLGHITEM paDlgItems,      // in: definition array
                                ULONG cDlgItems)           // in: array item count (NOT array size)
@@ -2807 +2807 @@
  */
 
-static APIRET Dlg2_CalcSizes(PDLGPRIVATE pDlgData)
+STATIC APIRET Dlg2_CalcSizes(PDLGPRIVATE pDlgData)
 {
     APIRET arc;
@@ -2852 +2852 @@
  */
 
-static APIRET Dlg3_PositionAndCreate(PDLGPRIVATE pDlgData,
+STATIC APIRET Dlg3_PositionAndCreate(PDLGPRIVATE pDlgData,
                                      HWND *phwndFocusItem)       // out: item to give focus to
 {
@@ -2904 +2904 @@
  */
 
-static VOID Dlg9_Cleanup(PDLGPRIVATE *ppDlgData)
+STATIC VOID Dlg9_Cleanup(PDLGPRIVATE *ppDlgData)
 {
     PDLGPRIVATE pDlgData;

trunk/src/helpers/dosh.c

@@ -4123 +4123 @@
  ********************************************************************/
 
-static PVOID    // G_pvGlobalInfoSeg = NULL,
+STATIC PVOID    // G_pvGlobalInfoSeg = NULL,
                 G_pvLocalInfoSeg = NULL;
 
@@ -4134 +4134 @@
  */
 
-static VOID GetInfoSegs(VOID)
+STATIC VOID GetInfoSegs(VOID)
 {
     SEL     GlobalInfoSegSelector,

trunk/src/helpers/dosh2.c

@@ -368 +368 @@
  */
 
-static APIRET CopyToBuffer(PSZ pszTarget,      // out: target buffer
+STATIC APIRET CopyToBuffer(PSZ pszTarget,      // out: target buffer
                            PCSZ pcszSource,    // in: source string
                            ULONG cbTarget)     // in: size of target buffer
@@ -485 +485 @@
  */
 
-static APIRET FindFile(const char *pcszCommand,      // in: command (e.g. "lvm")
+STATIC APIRET FindFile(const char *pcszCommand,      // in: command (e.g. "lvm")
                        PSZ pszExecutable,            // out: full path (e.g. "F:\os2\lvm.exe")
                        ULONG cbExecutable)           // in: sizeof (*pszExecutable)
@@ -785 +785 @@
  */
 
-static APIRET AppendPartition(PARTITIONINFO **pppiFirst,
+STATIC APIRET AppendPartition(PARTITIONINFO **pppiFirst,
                               PARTITIONINFO **pppiThis,    // in/out: partition info; pointer will be advanced
                               PUSHORT posCount,            // in/out: partition count
@@ -916 +916 @@
  */
 
-static USHORT GetCyl(USHORT rBeginSecCyl)
+STATIC USHORT GetCyl(USHORT rBeginSecCyl)
 {
     return (   (rBeginSecCyl & 0x00C0) << 2)
@@ -931 +931 @@
  */
 
-static USHORT GetSec(USHORT rBeginSecCyl)
+STATIC USHORT GetSec(USHORT rBeginSecCyl)
 {
     return rBeginSecCyl & 0x003F;
@@ -1018 +1018 @@
  */
 
-static APIRET GetPrimaryPartitions(PARTITIONINFO **pppiFirst,
+STATIC APIRET GetPrimaryPartitions(PARTITIONINFO **pppiFirst,
                                    PARTITIONINFO **pppiThis,
                                    PUSHORT posCount,       // in/out: partition count
@@ -1105 +1105 @@
  */
 
-static APIRET GetLogicalDrives(PARTITIONINFO **pppiFirst,
+STATIC APIRET GetLogicalDrives(PARTITIONINFO **pppiFirst,
                                PARTITIONINFO **pppiThis,
                                PUSHORT posCount,
@@ -1194 +1194 @@
  */
 
-static APIRET GetExtendedPartition(PARTITIONINFO **pppiFirst,
+STATIC APIRET GetExtendedPartition(PARTITIONINFO **pppiFirst,
                                    PARTITIONINFO **pppiThis,
                                    PUSHORT posCount,
@@ -1239 +1239 @@
  */
 
-static APIRET ReadFDiskPartitions(PARTITIONINFO **ppPartitionInfos,
+STATIC APIRET ReadFDiskPartitions(PARTITIONINFO **ppPartitionInfos,
                                   USHORT *pcPartitions,
                                   PUSHORT pusContext)              // out: error context
@@ -1312 +1312 @@
  */
 
-static VOID CleanPartitionInfos(PPARTITIONINFO ppiThis)
+STATIC VOID CleanPartitionInfos(PPARTITIONINFO ppiThis)
 {
     while (ppiThis)
@@ -2019 +2019 @@
  */
 
-static BOOL PerformMatch(PCSZ pMask,
+STATIC BOOL PerformMatch(PCSZ pMask,
                          PCSZ pName,
                          int fHasDot)

trunk/src/helpers/eah.c

@@ -117 +117 @@
 
 // forward declarations to helper funcs at bottom
-static PEALIST      ReadEAList(ULONG, PVOID);
-static EABINDING *  ReadEAByIndex(ULONG, PVOID, ULONG);
-static EABINDING *  ReadEAByName(ULONG, PVOID, PSZ);
-static PDENA2       ReadDenaByIndex(ULONG, PVOID, ULONG);
-static PEABINDING   GetEAValue(ULONG, PVOID, PDENA2);
-static void         SetupQueryEAInfo(PDENA2, PEAOP2);
-static PEABINDING   ConvertFeal2Binding(PFEA2LIST);
-static APIRET       WriteEAList(ULONG, PVOID, PEALIST);
-static APIRET       WriteEA(ULONG, PVOID, PEABINDING);
-static PFEA2LIST    ConvertBinding2Feal(PEABINDING);
+STATIC PEALIST      ReadEAList(ULONG, PVOID);
+STATIC EABINDING *  ReadEAByIndex(ULONG, PVOID, ULONG);
+STATIC EABINDING *  ReadEAByName(ULONG, PVOID, PSZ);
+STATIC PDENA2       ReadDenaByIndex(ULONG, PVOID, ULONG);
+STATIC PEABINDING   GetEAValue(ULONG, PVOID, PDENA2);
+STATIC void         SetupQueryEAInfo(PDENA2, PEAOP2);
+STATIC PEABINDING   ConvertFeal2Binding(PFEA2LIST);
+STATIC APIRET       WriteEAList(ULONG, PVOID, PEALIST);
+STATIC APIRET       WriteEA(ULONG, PVOID, PEABINDING);
+STATIC PFEA2LIST    ConvertBinding2Feal(PEABINDING);
 
 /*
@@ -952 +952 @@
  */
 
-static PEALIST ReadEAList(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
+STATIC PEALIST ReadEAList(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
                           PVOID pfile)
 {
@@ -984 +984 @@
  */
 
-static PEABINDING ReadEAByIndex(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
+STATIC PEABINDING ReadEAByIndex(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
                                 PVOID pfile,
                                 ULONG index)
@@ -999 +999 @@
  */
 
-static PEABINDING ReadEAByName(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
+STATIC PEABINDING ReadEAByName(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
                                PVOID pfile,
                                PSZ name)
@@ -1039 +1039 @@
  */
 
-static PDENA2 ReadDenaByIndex(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
+STATIC PDENA2 ReadDenaByIndex(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
                               PVOID pfile, // in: file handle or name
                               ULONG index) // in: EA index (>= 1)
@@ -1069 +1069 @@
  */
 
-static PEABINDING GetEAValue(ULONG type,  // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
+STATIC PEABINDING GetEAValue(ULONG type,  // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
                              PVOID pfile, // in: file handle or path
                              PDENA2 dena) // in: buffer allocated by ReadDenaByIndex
@@ -1097 +1097 @@
  */
 
-static void SetupQueryEAInfo(PDENA2 dena,  // in: buffer allocated by ReadDenaByIndex
+STATIC void SetupQueryEAInfo(PDENA2 dena,  // in: buffer allocated by ReadDenaByIndex
                              PEAOP2 eaop)  // out: EAOP2 to fill
 {
@@ -1125 +1125 @@
  */
 
-static PEABINDING ConvertFeal2Binding(PFEA2LIST feal)
+STATIC PEABINDING ConvertFeal2Binding(PFEA2LIST feal)
 {
     PFEA2 fea = (&((feal->list) [0]));
@@ -1151 +1151 @@
  */
 
-static APIRET WriteEAList(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
+STATIC APIRET WriteEAList(ULONG type, // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
                           PVOID pfile,
                           PEALIST list)
@@ -1173 +1173 @@
  */
 
-static APIRET WriteEA(ULONG type,          // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
+STATIC APIRET WriteEA(ULONG type,          // in: ENUMEA_REFTYPE_FHANDLE or  ENUMEA_REFTYPE_PATH
                       PVOID pfile,
                       PEABINDING binding)
@@ -1198 +1198 @@
  */
 
-static PFEA2LIST ConvertBinding2Feal(PEABINDING binding)
+STATIC PFEA2LIST ConvertBinding2Feal(PEABINDING binding)
 {
     unsigned int feal_size

trunk/src/helpers/encodings.c

@@ -154 +154 @@
 } ENCCASEFOLD, *PENCCASEFOLD;
 
-static PENCCASEFOLD G_pFold = NULL;
+STATIC PENCCASEFOLD G_pFold = NULL;
 
 /*

trunk/src/helpers/exeh.c

@@ -565 +565 @@
  */
 
-static VOID ParseBldLevel(PEXECUTABLE pExec)
+STATIC VOID ParseBldLevel(PEXECUTABLE pExec)
 {
     PCSZ    pStartOfVendor,
@@ -1112 +1112 @@
  */
 
-static APIRET ScanLXEntryTable(PEXECUTABLE pExec,
+STATIC APIRET ScanLXEntryTable(PEXECUTABLE pExec,
                                PFSYSFUNCTION paFunctions,
                                PULONG pcEntries)        // out: entry table entry count; ptr can be NULL
@@ -1353 +1353 @@
  */
 
-static APIRET ScanNEEntryTable(PEXECUTABLE pExec,
+STATIC APIRET ScanNEEntryTable(PEXECUTABLE pExec,
                                PFSYSFUNCTION paFunctions,
                                PULONG pcEntries)        // out: entry table entry count; ptr can be NULL
@@ -1448 +1448 @@
  */
 
-static int _Optlink Compare(const void *key,
+STATIC int _Optlink Compare(const void *key,
                             const void *element)
 {
@@ -1477 +1477 @@
  */
 
-static APIRET ScanNameTable(PEXECUTABLE pExec,
+STATIC APIRET ScanNameTable(PEXECUTABLE pExec,
                             ULONG cFunctions,
                             PFSYSFUNCTION paFunctions)
@@ -2234 +2234 @@
  */
 
-static APIRET ExpandIterdata1(char *pabTarget,         // out: page data (pagesize as in lx spec)
+STATIC APIRET ExpandIterdata1(char *pabTarget,         // out: page data (pagesize as in lx spec)
                               int cbTarget,            // in: sizeof *pabTarget (pagesize as in lx spec)
                               PCSZ pabSource,   // in: compressed source data in EXEPACK:1 format
@@ -2299 +2299 @@
  */
 
-static void memcpyw(char *pch1, PCSZ pch2, size_t cch)
+STATIC void memcpyw(char *pch1, PCSZ pch2, size_t cch)
 {
     /*
@@ -2333 +2333 @@
  */
 
-static void memcpyb(char *pch1, PCSZ pch2, size_t cch)
+STATIC void memcpyb(char *pch1, PCSZ pch2, size_t cch)
 {
     /*
@@ -2368 +2368 @@
  */
 
-static APIRET ExpandIterdata2(char *pachPage,              // out: page data (pagesize as in lx spec)
+STATIC APIRET ExpandIterdata2(char *pachPage,              // out: page data (pagesize as in lx spec)
                               int cchPage,                 // in: sizeof *pachPage (pagesize as in lx spec)
                               PCSZ pachSrcPage,     // in: compressed source data in EXEPACK:1 format
@@ -2583 +2583 @@
  */
 
-static APIRET GetOfsFromPageTableIndex(PEXECUTABLE pExec,   // in: executable from exehOpen
+STATIC APIRET GetOfsFromPageTableIndex(PEXECUTABLE pExec,   // in: executable from exehOpen
                                        ULONG ulObjPageTblIndexThis,  // in: object page table index to look for
                                        PULONG pulFlags,        // out: page flags

trunk/src/helpers/gpih.c

@@ -109 +109 @@
  ********************************************************************/
 
-static HMTX     G_hmtxLCIDs = NULLHANDLE;
+STATIC HMTX     G_hmtxLCIDs = NULLHANDLE;
 
 /* ******************************************************************
@@ -211 +211 @@
  */
 
-static VOID HackColor(PBYTE pb, double dFactor)
+STATIC VOID HackColor(PBYTE pb, double dFactor)
 {
     ULONG ul = (ULONG)((double)(*pb) * dFactor);

trunk/src/helpers/lan.c

@@ -99 +99 @@
     };
 
-static ULONG    G_ulNetsResolved = -1;      // -1 == not init'd
+STATIC ULONG    G_ulNetsResolved = -1;      // -1 == not init'd
                                             // 0  == success
                                             // APIRET == failure

trunk/src/helpers/level.c

@@ -483 +483 @@
  */
 
-static APIRET _readsysleveldata(HFILE hFile,
+STATIC APIRET _readsysleveldata(HFILE hFile,
                                 PSYSLEVELDATA psld)
 {
@@ -496 +496 @@
  */
 
-static APIRET _writesysleveldata(HFILE hFile,
+STATIC APIRET _writesysleveldata(HFILE hFile,
                                  PSYSLEVELDATA psld)
 {
@@ -509 +509 @@
  */
 
-static APIRET _locatesysleveldata(HFILE hFile)
+STATIC APIRET _locatesysleveldata(HFILE hFile)
 {
     ULONG ulPos, ulData;
@@ -527 +527 @@
  */
 
-static PSYSLEVELDATA _allocsysleveldata(HFILE hFile)
+STATIC PSYSLEVELDATA _allocsysleveldata(HFILE hFile)
 {
     return (PSYSLEVELDATA) malloc(sizeof(SYSLEVELDATA));
@@ -537 +537 @@
  */
 
-static VOID _freesysleveldata(PSYSLEVELDATA psld)
+STATIC VOID _freesysleveldata(PSYSLEVELDATA psld)
 {
     if (psld)
@@ -548 +548 @@
  */
 
-static APIRET _writesyslevelheader(HFILE hFile,
+STATIC APIRET _writesyslevelheader(HFILE hFile,
                                    PSYSLEVELHEADER pslh)
 {
@@ -561 +561 @@
  */
 
-static BOOL _isasyslevelfile(PSZ pszFile,
+STATIC BOOL _isasyslevelfile(PSZ pszFile,
                              PSZ pszCID)
 {
@@ -602 +602 @@
  */
 
-static APIRET _getfullname(PVOID pBuffer,
+STATIC APIRET _getfullname(PVOID pBuffer,
                            PSZ pszFileName)
 {
@@ -622 +622 @@
  */
 
-static APIRET _findsyslevelfile(PSZ pszName,
+STATIC APIRET _findsyslevelfile(PSZ pszName,
                                 PSZ pszCID,
                                 PVOID pBuffer)
@@ -668 +668 @@
  */
 
-static APIRET _findallsyslevelfiles(PSZ achFileName,
+STATIC APIRET _findallsyslevelfiles(PSZ achFileName,
                                     PSZ pszCID,
                                     PPVOID ppBuffer,
@@ -759 +759 @@
  */
 
-static APIRET _searchsubdirs(PSZ pszName,
+STATIC APIRET _searchsubdirs(PSZ pszName,
                              PSZ pszCID,
                              PVOID pBuffer)
@@ -811 +811 @@
  */
 
-static ULONG _firstdrive(ULONG ulDriveMap)
+STATIC ULONG _firstdrive(ULONG ulDriveMap)
 {
     return _nextdrive(ulDriveMap, 2);
@@ -821 +821 @@
  */
 
-static ULONG _nextdrive(ULONG ulDriveMap,
+STATIC ULONG _nextdrive(ULONG ulDriveMap,
                         ULONG ulCurrent)
 {

trunk/src/helpers/memdebug.c

@@ -223 +223 @@
  */
 
-static VOID LogError(const char *pcszFormat,     // in: format string (like with printf)
+STATIC VOID LogError(const char *pcszFormat,     // in: format string (like with printf)
                      ...)                        // in: additional stuff (like with printf)
 {
@@ -244 +244 @@
  */
 
-static PHEAPITEM FindHeapItem(void *p)
+STATIC PHEAPITEM FindHeapItem(void *p)
 {
     return ((PHEAPITEM)treeFind(G_pHeapItemsRoot,
@@ -257 +257 @@
  */
 
-static VOID FillHeapItem(PHEAPITEM pHeapItem,
+STATIC VOID FillHeapItem(PHEAPITEM pHeapItem,
                          void *prc,
                          size_t stSize,
@@ -287 +287 @@
  */
 
-static VOID CheckMagics(const char *pcszParentFunc,
+STATIC VOID CheckMagics(const char *pcszParentFunc,
                         PHEAPITEM pHeapItem,
                         PBYTE p,

trunk/src/helpers/memdebug_win.c

@@ -272 +272 @@
  */
 
-static VOID CreateRecords(HWND hwndCnr,
+STATIC VOID CreateRecords(HWND hwndCnr,
                           PULONG pulTotalItems,
                           PULONG pulAllocatedItems,
@@ -411 +411 @@
  */
 
-static SHORT EXPENTRY mnu_fnCompareIndex(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
+STATIC SHORT EXPENTRY mnu_fnCompareIndex(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
 {
     pStorage = pStorage; // to keep the compiler happy
@@ -429 +429 @@
  */
 
-static SHORT EXPENTRY mnu_fnCompareSourceFile(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
+STATIC SHORT EXPENTRY mnu_fnCompareSourceFile(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
 {
     HAB habDesktop = WinQueryAnchorBlock(HWND_DESKTOP);
@@ -458 +458 @@
  */
 
-static SHORT EXPENTRY mnu_fnCompareSize(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
+STATIC SHORT EXPENTRY mnu_fnCompareSize(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
 {
     pStorage = pStorage; // to keep the compiler happy
@@ -478 +478 @@
  */
 
-static SHORT EXPENTRY mnu_fnCompareAddress(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
+STATIC SHORT EXPENTRY mnu_fnCompareAddress(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
 {
     pStorage = pStorage; // to keep the compiler happy

trunk/src/helpers/nls.c

@@ -762 +762 @@
  */
 
-static VOID InitUpperMap(VOID)
+STATIC VOID InitUpperMap(VOID)
 {
     ULONG ul;

trunk/src/helpers/nlscache.c

@@ -78 +78 @@
  ********************************************************************/
 
-static HAB                 G_hab = NULLHANDLE;
-static HMODULE             G_hmod = NULLHANDLE;
-static PCSTRINGENTITY      G_paEntities = NULL;
-static ULONG               G_cEntities = 0;
+STATIC HAB                 G_hab = NULLHANDLE;
+STATIC HMODULE             G_hmod = NULLHANDLE;
+STATIC PCSTRINGENTITY      G_paEntities = NULL;
+STATIC ULONG               G_cEntities = 0;
 
 /*
@@ -89 +89 @@
  */
 
-static ULONG ReplaceEntities(PXSTRING pstr)
+STATIC ULONG ReplaceEntities(PXSTRING pstr)
 {
     ULONG ul,
@@ -116 +116 @@
  */
 
-static void LoadString(ULONG ulID,
+STATIC void LoadString(ULONG ulID,
                        PSZ *ppsz,
                        PULONG pulLength)        // out: length of new string (ptr can be NULL)
@@ -145 +145 @@
 }
 
-static HMTX        G_hmtxStringsCache = NULLHANDLE;
-static TREE        *G_StringsCache;
-static LONG        G_cStringsInCache = 0;
+STATIC HMTX        G_hmtxStringsCache = NULLHANDLE;
+STATIC TREE        *G_StringsCache;
+STATIC LONG        G_cStringsInCache = 0;
 
 /*
@@ -155 +155 @@
  */
 
-static BOOL LockStrings(VOID)
+STATIC BOOL LockStrings(VOID)
 {
     BOOL brc = FALSE;
@@ -180 +180 @@
  */
 
-static VOID UnlockStrings(VOID)
+STATIC VOID UnlockStrings(VOID)
 {
     DosReleaseMutexSem(G_hmtxStringsCache);

trunk/src/helpers/regexp.c

@@ -62 +62 @@
 #include <malloc.h>
 #include <memory.h>
+
+#include "setup.h"                      // code generation and debugging options
+
 #define ERE_C
 #include "helpers\regexp.h"
@@ -67 +70 @@
 #define isword(c) (isalnum(c)||(c)=='_')
 
-static int val_of_hex(char c)
+STATIC int val_of_hex(char c)
 {
     if (c >= '0' && c <= '9')
@@ -78 +81 @@
 }
 
-static int escaped(const char *s)
+STATIC int escaped(const char *s)
 {
     if (s[0] == 'x' && isxdigit(s[1]))
@@ -109 +112 @@
 }
 
-static const char *past_escaped(const char *s)
+STATIC const char *past_escaped(const char *s)
 {
     if (s[0] == 'x' && isxdigit(s[1]))
@@ -119 +122 @@
 #define zero_cclass(cclass) memset(cclass, 0, 0x100 >> 3)
 
-static unsigned char bits[] =
+STATIC unsigned char bits[] =
 {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
 
@@ -126 +129 @@
 #define remove_from_cclass(n, cclass) (cclass[(unsigned char)(n)>>3] &= ~bits[(unsigned char)(n) & 7])
 
-static void invert_cclass(unsigned char *cclass)
+STATIC void invert_cclass(unsigned char *cclass)
 {
     int i;
@@ -148 +151 @@
 /* I use my own wrapper functions so I can take their addresses.
  * Remember, isalnum etc. can be implemented as macros... */
-static BOOLEAN my_isalnum(int ch)
+STATIC BOOLEAN my_isalnum(int ch)
 {
     return isalnum(ch);
 }
-static BOOLEAN my_isalpha(int ch)
+STATIC BOOLEAN my_isalpha(int ch)
 {
     return isalpha(ch);
 }
-static BOOLEAN my_isblank(int ch)
+STATIC BOOLEAN my_isblank(int ch)
 {
     return ch == ' ' || ch == '\t';
 }
-static BOOLEAN my_iscntrl(int ch)
+STATIC BOOLEAN my_iscntrl(int ch)
 {
     return iscntrl(ch);
 }
-static BOOLEAN my_isdigit(int ch)
+STATIC BOOLEAN my_isdigit(int ch)
 {
     return isdigit(ch);
 }
-static BOOLEAN my_islower(int ch)
+STATIC BOOLEAN my_islower(int ch)
 {
     return islower(ch);
 }
-static BOOLEAN my_isprint(int ch)
+STATIC BOOLEAN my_isprint(int ch)
 {
     return isprint(ch);
 }
-static BOOLEAN my_ispunct(int ch)
+STATIC BOOLEAN my_ispunct(int ch)
 {
     return ispunct(ch);
 }
-static BOOLEAN my_isspace(int ch)
+STATIC BOOLEAN my_isspace(int ch)
 {
     return isspace(ch);
 }
-static BOOLEAN my_isupper(int ch)
+STATIC BOOLEAN my_isupper(int ch)
 {
     return isupper(ch);
 }
-static BOOLEAN my_isxdigit(int ch)
+STATIC BOOLEAN my_isxdigit(int ch)
 {
     return isxdigit(ch);
@@ -201 +204 @@
 POSIX_CCLASS;
 
-static POSIX_CCLASS posix_cclass[] =
+STATIC POSIX_CCLASS posix_cclass[] =
 {
     5, "alnum", my_isalnum,
@@ -216 +219 @@
 };
 
-static int find_posix(const char *str)
+STATIC int find_posix(const char *str)
 {
     int p;
@@ -236 +239 @@
 }
 
-static int cclass_thisch(const char *str)
+STATIC int cclass_thisch(const char *str)
 {
     switch (str[0])
@@ -255 +258 @@
 }
 
-static const char *cclass_nextch(const char *str)
+STATIC const char *cclass_nextch(const char *str)
 {
     int p;
@@ -268 +271 @@
 }
 
-static unsigned char *compile_cclass(const char *str,
+STATIC unsigned char *compile_cclass(const char *str,
                                      const char **str_after,
                                      int erecf,
@@ -424 +427 @@
 };
 
-static MATCH null_match =
+STATIC MATCH null_match =
 {MTYPE_NULL};
 
 #define NULL_MATCH (&null_match)
 
-static void delete_match(MATCH * match)
+STATIC void delete_match(MATCH * match)
 {
     if (match == NULL_MATCH)
@@ -477 +480 @@
  */
 
-static unsigned shortest_match(const MATCH * match)
+STATIC unsigned shortest_match(const MATCH * match)
 {
     unsigned a, b;
@@ -535 +538 @@
 }
 
-static BOOLEAN got_backrefs(MATCH * match)
+STATIC BOOLEAN got_backrefs(MATCH * match)
 {
     switch (match->mtype)
@@ -555 +558 @@
 }
 
-static MATCH *remove_subs(MATCH * match)
+STATIC MATCH *remove_subs(MATCH * match)
 {
     switch (match->mtype)
@@ -584 +587 @@
 }
 
-static int count_sub(const MATCH * match)
+STATIC int count_sub(const MATCH * match)
 {
     switch (match->mtype)
@@ -652 +655 @@
 #define CH_BACK_END     (-2000+9)
 
-static int boring_string(const char *s)
+STATIC int boring_string(const char *s)
 {
     int n = 0;
@@ -666 +669 @@
 }
 
-static int thisch(const char *str)
+STATIC int thisch(const char *str)
 {
     int n;
@@ -739 +742 @@
 }
 
-static const char *nextch(const char *str)
+STATIC const char *nextch(const char *str)
 {
     int n;
@@ -792 +795 @@
 }
 
-static MATCH *compile_match(const char *str, const char **str_after, int erecf, int *rc);
-
-static const char *scan_number(const char *str, unsigned *num)
+STATIC MATCH *compile_match(const char *str, const char **str_after, int erecf, int *rc);
+
+STATIC const char *scan_number(const char *str, unsigned *num)
 {
     if (!isdigit(*str))
@@ -805 +808 @@
 }
 
-static MATCH *create_match(int *rc)
+STATIC MATCH *create_match(int *rc)
 {
     MATCH *match;
@@ -817 +820 @@
 }
 
-static MATCH *compile_term(const char *str, const char **str_after, int erecf, int *rc)
+STATIC MATCH *compile_term(const char *str, const char **str_after, int erecf, int *rc)
 {
     MATCH *match;
@@ -995 +998 @@
 }
 
-static MTYPE repeat_type_of(int c)
+STATIC MTYPE repeat_type_of(int c)
 {
     switch (c)
@@ -1012 +1015 @@
 }
 
-static MATCH *compile_factor(const char *str, const char **str_after, int erecf, int *rc)
+STATIC MATCH *compile_factor(const char *str, const char **str_after, int erecf, int *rc)
 {
     MATCH *match, *parent;
@@ -1084 +1087 @@
 }
 
-static MATCH *compile_factors(const char *str, const char **str_after, int erecf, int *rc)
+STATIC MATCH *compile_factors(const char *str, const char **str_after, int erecf, int *rc)
 {
     MATCH *match;
@@ -1120 +1123 @@
 
 /*...scompile_match   \45\ factors\124\factors:0: */
-static MATCH *compile_match(const char *str, const char **str_after, int erecf, int *rc)
+STATIC MATCH *compile_match(const char *str, const char **str_after, int erecf, int *rc)
 {
     MATCH *match;
@@ -1158 +1161 @@
 /*...sprint_tree:0: */
 /*...sdo_indent:0: */
-static void do_indent(int indent)
+STATIC void do_indent(int indent)
 {
     while (indent--)
@@ -1164 +1167 @@
 }
 
-static void print_tree(const MATCH * match, int indent)
+STATIC void print_tree(const MATCH * match, int indent)
 {
     do_indent(indent);
@@ -1327 +1330 @@
 
 /*...screate_fsm:0: */
-static FSM *create_fsm(int *rc)
+STATIC FSM *create_fsm(int *rc)
 {
     FSM *fsm;
@@ -1353 +1356 @@
 
 /*...smalloc_state:0: */
-static int malloc_state(FSM * fsm)
+STATIC int malloc_state(FSM * fsm)
 {
     if (fsm->n_states == MAX_STATES)
@@ -1365 +1368 @@
  * Return TRUE if all went ok. */
 
-static BOOLEAN malloc_edge(int s, EDGE * edge, FSM * fsm)
+STATIC BOOLEAN malloc_edge(int s, EDGE * edge, FSM * fsm)
 {
     int edge_no, n_edges = fsm->n_edges++;
@@ -1431 +1434 @@
 /*...smake_fsm_from_match:0: */
 /*...sadd_edge_to_fsm_character:0: */
-static BOOLEAN add_edge_to_fsm_character(int s, int f, FSM * fsm, char character)
+STATIC BOOLEAN add_edge_to_fsm_character(int s, int f, FSM * fsm, char character)
 {
     EDGE edge;
@@ -1441 +1444 @@
 }
 /*...sadd_edge_to_fsm_ncharacter:0: */
-static BOOLEAN add_edge_to_fsm_ncharacter(int s, int f, FSM * fsm, char character)
+STATIC BOOLEAN add_edge_to_fsm_ncharacter(int s, int f, FSM * fsm, char character)
 {
     EDGE edge;
@@ -1451 +1454 @@
 }
 /*...sadd_edge_to_fsm_string:0: */
-static BOOLEAN add_edge_to_fsm_string(int s, int f, FSM * fsm, char *string)
+STATIC BOOLEAN add_edge_to_fsm_string(int s, int f, FSM * fsm, char *string)
 {
     EDGE edge;
@@ -1461 +1464 @@
 }
 /*...sadd_edge_to_fsm_cclass:0: */
-static BOOLEAN add_edge_to_fsm_cclass(int s, int f, FSM * fsm, unsigned char *cclass)
+STATIC BOOLEAN add_edge_to_fsm_cclass(int s, int f, FSM * fsm, unsigned char *cclass)
 {
     EDGE edge;
@@ -1471 +1474 @@
 }
 /*...sadd_edge_to_fsm_dot:0: */
-static BOOLEAN add_edge_to_fsm_dot(int s, int f, FSM * fsm)
+STATIC BOOLEAN add_edge_to_fsm_dot(int s, int f, FSM * fsm)
 {
     EDGE edge;
@@ -1480 +1483 @@
 }
 /*...sadd_edge_to_fsm_word:0: */
-static BOOLEAN add_edge_to_fsm_word(int s, int f, FSM * fsm)
+STATIC BOOLEAN add_edge_to_fsm_word(int s, int f, FSM * fsm)
 {
     EDGE edge;
@@ -1489 +1492 @@
 }
 /*...sadd_edge_to_fsm_nword:0: */
-static BOOLEAN add_edge_to_fsm_nword(int s, int f, FSM * fsm)
+STATIC BOOLEAN add_edge_to_fsm_nword(int s, int f, FSM * fsm)
 {
     EDGE edge;
@@ -1498 +1501 @@
 }
 /*...sadd_edge_to_fsm_epsilon:0: */
-static BOOLEAN add_edge_to_fsm_epsilon(int s, int f, FSM * fsm)
+STATIC BOOLEAN add_edge_to_fsm_epsilon(int s, int f, FSM * fsm)
 {
     EDGE edge;
@@ -1507 +1510 @@
 }
 /*...sadd_edge_to_fsm_special:0: */
-static BOOLEAN add_edge_to_fsm_special(int s, int f, FSM * fsm, ETYPE etype)
+STATIC BOOLEAN add_edge_to_fsm_special(int s, int f, FSM * fsm, ETYPE etype)
 {
     EDGE edge;
@@ -1517 +1520 @@
 }
 /*...sadd_edge_to_fsm_back:0: */
-static BOOLEAN add_edge_to_fsm_back(int s, int f, FSM * fsm, int n_span)
+STATIC BOOLEAN add_edge_to_fsm_back(int s, int f, FSM * fsm, int n_span)
 {
     EDGE edge;
@@ -1528 +1531 @@
 }
 
-static BOOLEAN make_fsm_from_match(MATCH * match, FSM * fsm, int *s, int *f)
+STATIC BOOLEAN make_fsm_from_match(MATCH * match, FSM * fsm, int *s, int *f)
 {
     int n1, n2, n3, n4, i;
@@ -1850 +1853 @@
  * recursion on loops of epsilon moves. */
 
-static BOOLEAN is_finish_reachable(FSM * fsm, int state_no)
+STATIC BOOLEAN is_finish_reachable(FSM * fsm, int state_no)
 {
     int edge_no;
@@ -1880 +1883 @@
 
 
-static void finish_states(int f, FSM * fsm, FSM * fsm_without)
+STATIC void finish_states(int f, FSM * fsm, FSM * fsm_without)
 {
     int state_no;
@@ -1892 +1895 @@
 
 /*...sdetermine_reachable:0: */
-static void determine_reachable(int s, FSM * fsm, FSM * fsm_without)
+STATIC void determine_reachable(int s, FSM * fsm, FSM * fsm_without)
 {
     int edge_no, to_state;
@@ -1906 +1909 @@
 
 /*...scopy_non_epsilons:0: */
-static void copy_non_epsilons(FSM * fsm, FSM * fsm_without)
+STATIC void copy_non_epsilons(FSM * fsm, FSM * fsm_without)
 {
     int state_no, edge_no;
@@ -1930 +1933 @@
  */
 
-static BOOLEAN copy_edges_reachable(
+STATIC BOOLEAN copy_edges_reachable(
                                        FSM * fsm,
                                        FSM * fsm_without,
@@ -1969 +1972 @@
 
 
-static BOOLEAN follow_epsilons(FSM * fsm, FSM * fsm_without)
+STATIC BOOLEAN follow_epsilons(FSM * fsm, FSM * fsm_without)
 {
     int state_no;
@@ -1981 +1984 @@
 
 
-static BOOLEAN remove_epsilons(int s, int f, FSM * fsm, FSM * fsm_without)
+STATIC BOOLEAN remove_epsilons(int s, int f, FSM * fsm, FSM * fsm_without)
 {
     // FSM with no epsilon moves will have the same number of states
@@ -2056 +2059 @@
 #define NR
 
-static void NR walk_fsm(const char *str, int state_no, CONTEXT * cx);
-
-static void NR walk_fsm_gated(const char *str, CONTEXT * cx, EDGE * e)
+STATIC void NR walk_fsm(const char *str, int state_no, CONTEXT * cx);
+
+STATIC void NR walk_fsm_gated(const char *str, CONTEXT * cx, EDGE * e)
 {
     if (e->gate != str)
@@ -2071 +2074 @@
 }
 
-static void NR walk_fsm_ssub(const char *str, CONTEXT * cx, EDGE * e)
+STATIC void NR walk_fsm_ssub(const char *str, CONTEXT * cx, EDGE * e)
 {
     SUBS subs;
@@ -2085 +2088 @@
 }
 
-static void NR walk_fsm_esub(const char *str, CONTEXT * cx, EDGE * e)
+STATIC void NR walk_fsm_esub(const char *str, CONTEXT * cx, EDGE * e)
 {
     SUBS *subs = cx->subs;
@@ -2102 +2105 @@
 }
 
-static void NR walk_fsm(const char *str, int state_no, CONTEXT * cx)
+STATIC void NR walk_fsm(const char *str, int state_no, CONTEXT * cx)
 {
     int edge_no;
@@ -2241 +2244 @@
 }
 
-static const char *match_fsm(FSM * fsm,
+STATIC const char *match_fsm(FSM * fsm,
                              int eremf,
                              const char *str,
@@ -2268 +2271 @@
 #ifdef DEBUG
 /*...sprint_fsm:0: */
-static void print_fsm(FSM * fsm, int s, BOOLEAN not_just_reachable)
+STATIC void print_fsm(FSM * fsm, int s, BOOLEAN not_just_reachable)
 {
     int state_no, edge_no;

trunk/src/helpers/shapewin.c

@@ -308 +308 @@
  */
 
-static void spanFree(PSHPSPAN pSpan)
+STATIC void spanFree(PSHPSPAN pSpan)
 {
     if (pSpan != NULL)
@@ -319 +319 @@
  */
 
-static PSHPSPAN spanCreate(void)
+STATIC PSHPSPAN spanCreate(void)
 {
     PSHPSPAN pSpan;
@@ -342 +342 @@
  */
 
-static PSHPSPAN spanExpand(PSHPSPAN pOld)
+STATIC PSHPSPAN spanExpand(PSHPSPAN pOld)
 {
     PSHPSPAN pNew;
@@ -369 +369 @@
  */
 
-static PSHPSPAN spanAppend(PSHPSPAN pSpan,
+STATIC PSHPSPAN spanAppend(PSHPSPAN pSpan,
                            int y,       // bottom y; top y = y+1
                            int x1,      // left x
@@ -497 +497 @@
  */
 
-static void shprgnDraw(HPS hps, PSHPREGION pRgn)
+STATIC void shprgnDraw(HPS hps, PSHPREGION pRgn)
 {
     POINTL      apt[3];
@@ -518 +518 @@
  */
 
-static MRESULT EXPENTRY shp_fnwpShapeRegion(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY shp_fnwpShapeRegion(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     PSHPREGION   pRgn;
@@ -591 +591 @@
  */
 
-static int shpmgrWMAdjustWindowPos(PSHPWINCTLDATA pCtrl, PSWP pSwp)
+STATIC int shpmgrWMAdjustWindowPos(PSHPWINCTLDATA pCtrl, PSWP pSwp)
 {
     int         i   ;
@@ -658 +658 @@
  */
 
-static int shpmgrUpdateRegions(PSHPWINCTLDATA pCtrl, PRECTL pRect)
+STATIC int shpmgrUpdateRegions(PSHPWINCTLDATA pCtrl, PRECTL pRect)
 {
     RECTL       rect, intern;
@@ -706 +706 @@
  */
 
-static PSHPSPAN shpmgrParseBitmap(HPS hps, PBITMAPINFOHEADER2 bmih2)
+STATIC PSHPSPAN shpmgrParseBitmap(HPS hps, PBITMAPINFOHEADER2 bmih2)
 {
     int             blen, hlen;
@@ -820 +820 @@
  */
 
-static int shpmgrWMCreate_Bitmap2Regions(PSHPWINCTLDATA pCtrl,  // in: shape control data
+STATIC int shpmgrWMCreate_Bitmap2Regions(PSHPWINCTLDATA pCtrl,  // in: shape control data
                                          HPS hpsMask)      // in: HPS with selected bitmap
 {
@@ -942 +942 @@
  */
 
-static int shpmgrWMCreate_Regions2Windows(PSHPWINCTLDATA pCtrl)
+STATIC int shpmgrWMCreate_Regions2Windows(PSHPWINCTLDATA pCtrl)
 {
     int         i   ;
@@ -1011 +1011 @@
  */
 
-static int shpmgrFreeRegion(PSHPWINCTLDATA pCtrl)
+STATIC int shpmgrFreeRegion(PSHPWINCTLDATA pCtrl)
 {
     int         i   ;
@@ -1041 +1041 @@
  */
 
-static PSHPWINCTLDATA shpmgrWMCreate(HWND hwnd, // in: shape window
+STATIC PSHPWINCTLDATA shpmgrWMCreate(HWND hwnd, // in: shape window
                                      PCREATESTRUCT pWin,    // in: create struct of WM_CREATE
                                      PSHPCTLDATA pData)       // in: SHPCTLDATA struct (WM_CREATE mp1)
@@ -1095 +1095 @@
  */
 
-static void shpmgrWMDestroy(PSHPWINCTLDATA pCtrl)
+STATIC void shpmgrWMDestroy(PSHPWINCTLDATA pCtrl)
 {
     if (pCtrl == NULL)
@@ -1145 +1145 @@
  */
 
-static MRESULT EXPENTRY shp_fnwpShapeMgr(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY shp_fnwpShapeMgr(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     PSHPWINCTLDATA   pCtrl;

trunk/src/helpers/textv_html.c

@@ -176 +176 @@
  */
 
-static VOID AppendChar(PCOPYTARGET pct,  // in/out: formatting buffer
+STATIC VOID AppendChar(PCOPYTARGET pct,  // in/out: formatting buffer
                        unsigned char c)
 {
@@ -205 +205 @@
  */
 
-static VOID AppendString(PCOPYTARGET pct,  // in/out: formatting buffer
+STATIC VOID AppendString(PCOPYTARGET pct,  // in/out: formatting buffer
                          char *ach)
 {
@@ -241 +241 @@
  */
 
-static VOID AppendLinebreakCheck(PCOPYTARGET pct)
+STATIC VOID AppendLinebreakCheck(PCOPYTARGET pct)
 {
     if ((!pct->fPRE) && (pct->fNeedsLinebreak))
@@ -268 +268 @@
  */
 
-static VOID AppendEscapeWith3Decimals(PCOPYTARGET pct,  // in/out: formatting buffer
+STATIC VOID AppendEscapeWith3Decimals(PCOPYTARGET pct,  // in/out: formatting buffer
                                       char *ach,
                                       USHORT us)
@@ -287 +287 @@
  */
 
-static VOID AppendEscapeWith4Decimals(PCOPYTARGET pct,  // in/out: formatting buffer
+STATIC VOID AppendEscapeWith4Decimals(PCOPYTARGET pct,  // in/out: formatting buffer
                                       char *ach,
                                       USHORT us)
@@ -315 +315 @@
  */
 
-static VOID StartList(PCOPYTARGET pct,     // in/out: formatting buffer
+STATIC VOID StartList(PCOPYTARGET pct,     // in/out: formatting buffer
                       ULONG ulListType)    // list type:
                                            // 0: unordered (UL)
@@ -362 +362 @@
  */
 
-static VOID StopList(PCOPYTARGET pct)
+STATIC VOID StopList(PCOPYTARGET pct)
 {
     if (pct->ulListLevel)
@@ -415 +415 @@
  */
 
-static VOID TagTITLE(PCOPYTARGET pct)
+STATIC VOID TagTITLE(PCOPYTARGET pct)
 {
     // pSource currently points to <TITLE tag
@@ -448 +448 @@
  */
 
-static VOID TagP(PCOPYTARGET pct)
+STATIC VOID TagP(PCOPYTARGET pct)
 {
     // append newline:
@@ -465 +465 @@
 }
 
-static VOID TagBR(PCOPYTARGET pct)
+STATIC VOID TagBR(PCOPYTARGET pct)
 {
     AppendChar(pct,
@@ -483 +483 @@
 }
 
-static VOID TagPRE(PCOPYTARGET pct)
+STATIC VOID TagPRE(PCOPYTARGET pct)
 {
     // start of PRE tag:
@@ -508 +508 @@
 }
 
-static VOID TagXPRE(PCOPYTARGET pct)
+STATIC VOID TagXPRE(PCOPYTARGET pct)
 {
     pct->fPRE = FALSE;
@@ -528 +528 @@
 }
 
-static VOID TagH1(PCOPYTARGET pct)
+STATIC VOID TagH1(PCOPYTARGET pct)
 {
     pct->fNeedsLinebreak = TRUE;
@@ -538 +538 @@
 }
 
-static VOID TagXH1(PCOPYTARGET pct)
+STATIC VOID TagXH1(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -549 +549 @@
 }
 
-static VOID TagH2(PCOPYTARGET pct)
+STATIC VOID TagH2(PCOPYTARGET pct)
 {
     pct->fNeedsLinebreak = TRUE;
@@ -559 +559 @@
 }
 
-static VOID TagXH2(PCOPYTARGET pct)
+STATIC VOID TagXH2(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -570 +570 @@
 }
 
-static VOID TagH3(PCOPYTARGET pct)
+STATIC VOID TagH3(PCOPYTARGET pct)
 {
     pct->fNeedsLinebreak = TRUE;
@@ -580 +580 @@
 }
 
-static VOID TagXH3(PCOPYTARGET pct)
+STATIC VOID TagXH3(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -591 +591 @@
 }
 
-static VOID TagH4(PCOPYTARGET pct)
+STATIC VOID TagH4(PCOPYTARGET pct)
 {
     pct->fNeedsLinebreak = TRUE;
@@ -601 +601 @@
 }
 
-static VOID TagXH4(PCOPYTARGET pct)
+STATIC VOID TagXH4(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -612 +612 @@
 }
 
-static VOID TagH5(PCOPYTARGET pct)
+STATIC VOID TagH5(PCOPYTARGET pct)
 {
     pct->fNeedsLinebreak = TRUE;
@@ -622 +622 @@
 }
 
-static VOID TagXH5(PCOPYTARGET pct)
+STATIC VOID TagXH5(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -633 +633 @@
 }
 
-static VOID TagH6(PCOPYTARGET pct)
+STATIC VOID TagH6(PCOPYTARGET pct)
 {
     pct->fNeedsLinebreak = TRUE;
@@ -643 +643 @@
 }
 
-static VOID TagXH6(PCOPYTARGET pct)
+STATIC VOID TagXH6(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -654 +654 @@
 }
 
-static VOID TagUL(PCOPYTARGET pct)
+STATIC VOID TagUL(PCOPYTARGET pct)
 {
     StartList(pct,
@@ -660 +660 @@
 }
 
-static VOID TagXUL(PCOPYTARGET pct)
+STATIC VOID TagXUL(PCOPYTARGET pct)
 {
     StopList(pct);
 }
 
-static VOID TagOL(PCOPYTARGET pct)
+STATIC VOID TagOL(PCOPYTARGET pct)
 {
     StartList(pct,
@@ -671 +671 @@
 }
 
-static VOID TagXOL(PCOPYTARGET pct)
+STATIC VOID TagXOL(PCOPYTARGET pct)
 {
     StopList(pct);
 }
 
-static VOID TagLI(PCOPYTARGET pct)
+STATIC VOID TagLI(PCOPYTARGET pct)
 {
     PLISTDESC pListDesc;
@@ -710 +710 @@
 }
 
-static VOID TagDL(PCOPYTARGET pct)
+STATIC VOID TagDL(PCOPYTARGET pct)
 {
     StartList(pct,
@@ -716 +716 @@
 }
 
-static VOID TagXDL(PCOPYTARGET pct)
+STATIC VOID TagXDL(PCOPYTARGET pct)
 {
     StopList(pct);
@@ -722 +722 @@
 }
 
-static VOID TagDT(PCOPYTARGET pct)
+STATIC VOID TagDT(PCOPYTARGET pct)
 {
     pct->fNeedsLinebreak = TRUE;
@@ -728 +728 @@
 }
 
-static VOID TagDD(PCOPYTARGET pct)
+STATIC VOID TagDD(PCOPYTARGET pct)
 {
     pct->fNeedsLinebreak = TRUE;
@@ -737 +737 @@
 }
 
-static VOID TagTR(PCOPYTARGET pct)
+STATIC VOID TagTR(PCOPYTARGET pct)
 {
     pct->fNeedsLinebreak = TRUE;
 }
 
-static VOID TagB(PCOPYTARGET pct)
+STATIC VOID TagB(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -748 +748 @@
 }
 
-static VOID TagXB(PCOPYTARGET pct)
+STATIC VOID TagXB(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -754 +754 @@
 }
 
-static VOID TagI(PCOPYTARGET pct)
+STATIC VOID TagI(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -760 +760 @@
 }
 
-static VOID TagXI(PCOPYTARGET pct)
+STATIC VOID TagXI(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -766 +766 @@
 }
 
-static VOID TagU(PCOPYTARGET pct)
+STATIC VOID TagU(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -772 +772 @@
 }
 
-static VOID TagXU(PCOPYTARGET pct)
+STATIC VOID TagXU(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -778 +778 @@
 }
 
-static VOID TagSTRIKE(PCOPYTARGET pct)
+STATIC VOID TagSTRIKE(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -784 +784 @@
 }
 
-static VOID TagXSTRIKE(PCOPYTARGET pct)
+STATIC VOID TagXSTRIKE(PCOPYTARGET pct)
 {
     AppendString(pct,
@@ -790 +790 @@
 }
 
-static VOID TagCODE(PCOPYTARGET pct)
+STATIC VOID TagCODE(PCOPYTARGET pct)
 {
     AppendEscapeWith3Decimals(pct,
@@ -797 +797 @@
 }
 
-static VOID TagXCODE(PCOPYTARGET pct)
+STATIC VOID TagXCODE(PCOPYTARGET pct)
 {
     AppendEscapeWith3Decimals(pct,
@@ -804 +804 @@
 }
 
-static VOID TagA(PCOPYTARGET pct)
+STATIC VOID TagA(PCOPYTARGET pct)
 {
     CHAR    szAnchor[10];
@@ -868 +868 @@
 }
 
-static VOID TagXA(PCOPYTARGET pct)
+STATIC VOID TagXA(PCOPYTARGET pct)
 {
     if (pct->fInLink)
@@ -892 +892 @@
  */
 
-static PFNPROCESSTAG FindTagProcessor(PSZ pszTag)
+STATIC PFNPROCESSTAG FindTagProcessor(PSZ pszTag)
 {
     PFNPROCESSTAG pProcessor = NULL;
@@ -1263 +1263 @@
  */
 
-static VOID HandleTag(PCOPYTARGET pct)
+STATIC VOID HandleTag(PCOPYTARGET pct)
 {
     PSZ     pStartOfTag = pct->pSource;
@@ -1418 +1418 @@
  */
 
-static unsigned char ConvertEscape(PSZ pszTag)
+STATIC unsigned char ConvertEscape(PSZ pszTag)
 {
     CHAR c0, c1;
@@ -1875 +1875 @@
  */
 
-static VOID HandleEscape(PCOPYTARGET pct)
+STATIC VOID HandleEscape(PCOPYTARGET pct)
 {
     // ampersand:

trunk/src/helpers/textview.c

@@ -279 +279 @@
  */
 
-static VOID SetSubFont(HPS hps,
+STATIC VOID SetSubFont(HPS hps,
                        PXFMTFONT pFont,
                        ULONG ulPointSize,
@@ -344 +344 @@
  */
 
-static VOID SetFormatFont(HPS hps,           // in: HPS to select default font into
+STATIC VOID SetFormatFont(HPS hps,           // in: HPS to select default font into
                           PXFMTCHARACTER pxfmtc, // in/out: format data
                           ULONG ulPointSize, // in: font point size (e.g. 12) or 0
@@ -386 +386 @@
  */
 
-static VOID AppendCharNoCheck(char **ppszNew,
+STATIC VOID AppendCharNoCheck(char **ppszNew,
                               PULONG pcbNew,
                               char **ppTarget,
@@ -510 +510 @@
  */
 
-static PSZ strhFindEOL2(PSZ *ppszSearchIn,        // in: where to search
+STATIC PSZ strhFindEOL2(PSZ *ppszSearchIn,        // in: where to search
                         PULONG pulOffset)       // out: offset (ptr can be NULL)
 {
@@ -633 +633 @@
  */
 
-static PTXVWORD CreateWord(HPS hps,
+STATIC PTXVWORD CreateWord(HPS hps,
                            PSZ *ppStartOfWord,
                            PFORMATLINEBUF pflbuf)
@@ -765 +765 @@
  */
 
-static PTXVWORD ProcessEscapes(char **ppCurrent,          // in/out: current position; initially points to esc char
+STATIC PTXVWORD ProcessEscapes(char **ppCurrent,          // in/out: current position; initially points to esc char
                                PXFORMATDATA pxfd,         // in/out: formatting data
                                PFORMATLINEBUF pflbuf,     // in/out: formatting buffer
@@ -1440 +1440 @@
  */
 
-static VOID DrawListMarker(HPS hps,
+STATIC VOID DrawListMarker(HPS hps,
                            PRECTL prclLine,        // current line rectangle
                            PTXVWORD pWordThis,    // current word
@@ -1902 +1902 @@
  */
 
-static VOID UpdateTextViewPresData(HWND hwndTextView,
+STATIC VOID UpdateTextViewPresData(HWND hwndTextView,
                                    PTEXTVIEWWINDATA ptxvd)
 {
@@ -1957 +1957 @@
  */
 
-static VOID AdjustViewRects(HWND hwndTextView,
+STATIC VOID AdjustViewRects(HWND hwndTextView,
                             PTEXTVIEWWINDATA ptxvd)
 {
@@ -2029 +2029 @@
  */
 
-static VOID FormatText2Screen(HWND hwndTextView,
+STATIC VOID FormatText2Screen(HWND hwndTextView,
                               PTEXTVIEWWINDATA ptxvd,
                               BOOL fAlreadyRecursing,  // in: set this to FALSE when calling
@@ -2186 +2186 @@
  */
 
-static VOID PaintViewText2Screen(PTEXTVIEWWINDATA ptxvd,
+STATIC VOID PaintViewText2Screen(PTEXTVIEWWINDATA ptxvd,
                                  PRECTL prcl2Paint)  // in: invalid rectangle, can be NULL == paint all
 {
@@ -2206 +2206 @@
  */
 
-static VOID PaintViewFocus(HPS hps,
+STATIC VOID PaintViewFocus(HPS hps,
                            PTEXTVIEWWINDATA ptxvd,
                            BOOL fFocus)
@@ -2237 +2237 @@
  */
 
-static VOID RepaintWord(PTEXTVIEWWINDATA ptxvd,
+STATIC VOID RepaintWord(PTEXTVIEWWINDATA ptxvd,
                         PTXVWORD pWordThis,
                         LONG lColor)
@@ -2292 +2292 @@
  */
 
-static VOID RepaintAnchor(PTEXTVIEWWINDATA ptxvd,
+STATIC VOID RepaintAnchor(PTEXTVIEWWINDATA ptxvd,
                           LONG lColor)
 {
@@ -2322 +2322 @@
  */
 
-static MRESULT ProcessCreate(HWND hwndTextView, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT ProcessCreate(HWND hwndTextView, MPARAM mp1, MPARAM mp2)
 {
     PXTEXTVIEWCDATA     pcd = (PXTEXTVIEWCDATA)mp1;
@@ -2468 +2468 @@
  */
 
-static VOID ProcessPaint(HWND hwndTextView)
+STATIC VOID ProcessPaint(HWND hwndTextView)
 {
     PTEXTVIEWWINDATA    ptxvd;
@@ -2562 +2562 @@
  */
 
-static VOID ProcessPresParamChanged(HWND hwndTextView, MPARAM mp1)
+STATIC VOID ProcessPresParamChanged(HWND hwndTextView, MPARAM mp1)
 {
     PTEXTVIEWWINDATA    ptxvd;
@@ -2592 +2592 @@
  */
 
-static VOID ProcessSetFocus(HWND hwndTextView, MPARAM mp2)
+STATIC VOID ProcessSetFocus(HWND hwndTextView, MPARAM mp2)
 {
     PTEXTVIEWWINDATA    ptxvd;
@@ -2655 +2655 @@
  */
 
-static MRESULT ProcessButton1Down(HWND hwndTextView, MPARAM mp1)
+STATIC MRESULT ProcessButton1Down(HWND hwndTextView, MPARAM mp1)
 {
     MRESULT             mrc = 0;
@@ -2727 +2727 @@
  */
 
-static MRESULT ProcessButton1Up(HWND hwndTextView, MPARAM mp1)
+STATIC MRESULT ProcessButton1Up(HWND hwndTextView, MPARAM mp1)
 {
     MRESULT             mrc = 0;
@@ -2769 +2769 @@
  */
 
-static MRESULT ProcessChar(HWND hwndTextView, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT ProcessChar(HWND hwndTextView, MPARAM mp1, MPARAM mp2)
 {
     MRESULT             mrc = 0;
@@ -2892 +2892 @@
  */
 
-static MRESULT ProcessJumpToAnchorName(HWND hwndTextView, MPARAM mp1)
+STATIC MRESULT ProcessJumpToAnchorName(HWND hwndTextView, MPARAM mp1)
 {
     MRESULT             mrc = 0;
@@ -2948 +2948 @@
  */
 
-static MRESULT ProcessDestroy(HWND hwndTextView, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT ProcessDestroy(HWND hwndTextView, MPARAM mp1, MPARAM mp2)
 {
     PTEXTVIEWWINDATA    ptxvd;
@@ -3022 +3022 @@
  */
 
-static MRESULT EXPENTRY fnwpTextView(HWND hwndTextView, ULONG msg, MPARAM mp1, MPARAM mp2)
+STATIC MRESULT EXPENTRY fnwpTextView(HWND hwndTextView, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     MRESULT             mrc = 0;
@@ -3568 +3568 @@
  */
 
-static PRQINFO3* prthEnumQueues(PULONG pulReturned)    // out: no. of queues found
+STATIC PRQINFO3* prthEnumQueues(PULONG pulReturned)    // out: no. of queues found
 {
     SPLERR  rc;
@@ -3610 +3610 @@
  */
 
-static VOID prthFreeBuf(PVOID pprq3)
+STATIC VOID prthFreeBuf(PVOID pprq3)
 {
     if (pprq3)
@@ -3632 +3632 @@
  */
 
-static HDC prthCreatePrinterDC(HAB hab,
+STATIC HDC prthCreatePrinterDC(HAB hab,
                                PRQINFO3 *pprq3,
                                PLONG palRes)  // out: 2 longs holding horizontal and vertical
@@ -3678 +3678 @@
  */
 
-static HCINFO* prthQueryForms(HDC hdc,
+STATIC HCINFO* prthQueryForms(HDC hdc,
                               PULONG pulCount)
 {
@@ -3710 +3710 @@
  */
 
-static HPS prthCreatePS(HAB hab,       // in: anchor block
+STATIC HPS prthCreatePS(HAB hab,       // in: anchor block
                         HDC hdc,       // in: printer device context
                         ULONG ulUnits) // in: one of:
@@ -3740 +3740 @@
  */
 
-static VOID prthStartDoc(HDC hdc,
+STATIC VOID prthStartDoc(HDC hdc,
                          PSZ pszDocTitle)
 {
@@ -3760 +3760 @@
  */
 
-static VOID prthNextPage(HDC hdc)
+STATIC VOID prthNextPage(HDC hdc)
 {
     DevEscape(hdc,
@@ -3779 +3779 @@
  */
 
-static VOID prthEndDoc(HDC hdc,
+STATIC VOID prthEndDoc(HDC hdc,
                        HPS hps)
 {

trunk/src/helpers/threads.c

@@ -84 +84 @@
  */
 
-static BOOL LockThreadInfos(VOID)
+STATIC BOOL LockThreadInfos(VOID)
 {
     APIRET arc = NO_ERROR;
@@ -110 +110 @@
  */
 
-static VOID UnlockThreadInfos(VOID)
+STATIC VOID UnlockThreadInfos(VOID)
 {
     DosReleaseMutexSem(G_hmtxThreadInfos);
@@ -126 +126 @@
  */
 
-static VOID _Optlink thr_fntGeneric(PVOID ptiMyself)
+STATIC VOID _Optlink thr_fntGeneric(PVOID ptiMyself)
 {
     PTHREADINFO pti = (PTHREADINFO)ptiMyself;

trunk/src/helpers/timer.c

@@ -159 +159 @@
  */
 
-static BOOL LockTimers(VOID)
+STATIC BOOL LockTimers(VOID)
 {
     if (!G_hmtxTimers)
@@ -176 +176 @@
  */
 
-static VOID UnlockTimers(VOID)
+STATIC VOID UnlockTimers(VOID)
 {
     DosReleaseMutexSem(G_hmtxTimers);
@@ -190 +190 @@
  */
 
-static PXTIMER FindTimer(PXTIMERSET pSet,          // in: timer set (from tmrCreateSet)
+STATIC PXTIMER FindTimer(PXTIMERSET pSet,          // in: timer set (from tmrCreateSet)
                          HWND hwnd,                // in: timer target window
                          USHORT usTimerID)         // in: timer ID
@@ -225 +225 @@
  */
 
-static VOID RemoveTimer(PXTIMERSET pSet,       // in: timer set (from tmrCreateSet)
+STATIC VOID RemoveTimer(PXTIMERSET pSet,       // in: timer set (from tmrCreateSet)
                         PXTIMER pTimer)        // in: timer to remove
 {
@@ -252 +252 @@
  */
 
-static VOID AdjustPMTimer(PXTIMERSET pSet)
+STATIC VOID AdjustPMTimer(PXTIMERSET pSet)
 {
     PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;

trunk/src/helpers/tmsgfile.c

@@ -122 +122 @@
 
 // globals
-static PCSZ     G_pcszStartMarker = "\n<--",
+STATIC PCSZ     G_pcszStartMarker = "\n<--",
                 G_pcszEndMarker = "-->:";
 
@@ -413 +413 @@
  */
 
-static VOID FreeInternalMem(PTMFMSGFILE pTmf)
+STATIC VOID FreeInternalMem(PTMFMSGFILE pTmf)
 {
     LONG   cItems;

trunk/src/helpers/tree.c

@@ -269 +269 @@
 
 #define LEAF &sentinel           // all leafs are sentinels
-static TREE sentinel = { LEAF, LEAF, 0, BLACK};
+STATIC TREE sentinel = { LEAF, LEAF, 0, BLACK};
 
 /*
@@ -359 +359 @@
  */
 
-static void rotateLeft(TREE **root,
+STATIC void rotateLeft(TREE **root,
                        TREE *x)
 {
@@ -396 +396 @@
  */
 
-static void rotateRight(TREE **root,
+STATIC void rotateRight(TREE **root,
                         TREE *x)
 {
@@ -433 +433 @@
  */
 
-static void insertFixup(TREE **root,
+STATIC void insertFixup(TREE **root,
                         TREE *x)
 {
@@ -583 +583 @@
  */
 
-static void deleteFixup(TREE **root,
+STATIC void deleteFixup(TREE **root,
                         TREE *tree)
 {

trunk/src/helpers/vcard.c

@@ -66 +66 @@
  ********************************************************************/
 
-static VOID FreeList(PLINKLIST *ppll);
+STATIC VOID FreeList(PLINKLIST *ppll);
 
 /* ******************************************************************
@@ -79 +79 @@
  */
 
-static VOID Translate(PXSTRING pstr,
+STATIC VOID Translate(PXSTRING pstr,
                       ULONG cpCurrent)
 {
@@ -107 +107 @@
  */
 
-static APIRET DecodeStringList(PCSZ pStart,
+STATIC APIRET DecodeStringList(PCSZ pStart,
                                PCSZ pEnd,
                                PXSTRING *ppaStrings,
@@ -299 +299 @@
  */
 
-static APIRET Tokenize(ULONG ulLevel,
+STATIC APIRET Tokenize(ULONG ulLevel,
                        PSZ *ppszInput,
                        PLINKLIST pllParent,
@@ -473 +473 @@
  */
 
-static PVCFPROPERTY FindValues(PLINKLIST pll,
+STATIC PVCFPROPERTY FindValues(PLINKLIST pll,
                                PCSZ pcszProperty,
                                PCSZ pcszParameter)
@@ -502 +502 @@
  */
 
-static VOID CopyStrings(PVCFPROPERTY pProp,
+STATIC VOID CopyStrings(PVCFPROPERTY pProp,
                         PCSZ *papcszValues,
                         ULONG cValues)
@@ -530 +530 @@
  */
 
-static ULONG GetFlagStrings(PXSTRING pastrParameters,
+STATIC ULONG GetFlagStrings(PXSTRING pastrParameters,
                             ULONG cParameters,
                             const PCSZ **apcsz,
@@ -558 +558 @@
 }
 
-static const PCSZ *apcszAddress[] =
+STATIC const PCSZ *apcszAddress[] =
     {
         &VCF_TYPE_ADR_DOM,
@@ -568 +568 @@
     };
 
-static const ULONG aflAddress[] =
+STATIC const ULONG aflAddress[] =
     {
         VCF_ADDRFL_DOM,
@@ -583 +583 @@
  */
 
-static VOID AppendAddress(PVCARD pvc,
+STATIC VOID AppendAddress(PVCARD pvc,
                           PVCFPROPERTY pProp)
 {
@@ -610 +610 @@
  */
 
-static VOID AppendLabel(PVCARD pvc,
+STATIC VOID AppendLabel(PVCARD pvc,
                         PVCFPROPERTY pProp)
 {
@@ -632 +632 @@
 }
 
-static const PCSZ *apcszPhone[] =
+STATIC const PCSZ *apcszPhone[] =
     {
         &VCF_TYPE_TEL_PREF,
@@ -649 +649 @@
     };
 
-static const ULONG aflPhone[] =
+STATIC const ULONG aflPhone[] =
     {
         VCF_PHONEFL_PREF,
@@ -671 +671 @@
  */
 
-static VOID AppendTel(PVCARD pvc,
+STATIC VOID AppendTel(PVCARD pvc,
                       PVCFPROPERTY pProp)
 {
@@ -815 +815 @@
  */
 
-static VOID FreeList(PLINKLIST *ppll)
+STATIC VOID FreeList(PLINKLIST *ppll)
 {
     PLISTNODE pNode = lstQueryFirstNode(*ppll);

trunk/src/helpers/wphandle.c

@@ -196 +196 @@
  */
 
-static VOID FreeChildrenTree(TREE **ppChildrenTree,
+STATIC VOID FreeChildrenTree(TREE **ppChildrenTree,
                              PLONG plCount)
 {
@@ -229 +229 @@
  */
 
-static APIRET NukeNameTrees(PHANDLESBUF pHandlesBuf)
+STATIC APIRET NukeNameTrees(PHANDLESBUF pHandlesBuf)
 {
     APIRET arc = NO_ERROR;
@@ -855 +855 @@
  */
 
-static APIRET ComposeThis(PHANDLESBUF pHandlesBuf,
+STATIC APIRET ComposeThis(PHANDLESBUF pHandlesBuf,
                           USHORT usHandle,         // in: handle to search for
                           PXSTRING pstrFilename,   // in/out: filename

trunk/src/helpers/xml.c

@@ -343 +343 @@
  */
 
-static int TREEENTRY CompareXStrings(ULONG ul1,
+STATIC int TREEENTRY CompareXStrings(ULONG ul1,
                                      ULONG ul2)
 {
@@ -914 +914 @@
  */
 
-static APIRET SetupParticleAndSubs(PCMELEMENTPARTICLE pParticle,
+STATIC APIRET SetupParticleAndSubs(PCMELEMENTPARTICLE pParticle,
                                    PXMLCONTENT pModel,
                                    TREE **ppElementNamesTree) // in: ptr to _CMELEMENTDECLNODE.ElementNamesTree
@@ -1074 +1074 @@
  */
 
-static VOID ValidateElement(PXMLDOM pDom,
+STATIC VOID ValidateElement(PXMLDOM pDom,
                             PDOMNODE pNewElement,     // in: new element
                             PCMELEMENTDECLNODE pParentElementDecl)
@@ -1233 +1233 @@
  */
 
-static VOID ValidateAttributeType(PXMLDOM pDom,
+STATIC VOID ValidateAttributeType(PXMLDOM pDom,
                                   PDOMNODE pAttrib,
                                   PCMATTRIBUTEDECLBASE *ppAttribDeclBase)
@@ -1297 +1297 @@
  */
 
-static VOID ValidateAllAttributes(PXMLDOM pDom,
+STATIC VOID ValidateAllAttributes(PXMLDOM pDom,
                                   PCMATTRIBUTEDECLBASE pAttribDeclBase,
                                   PDOMNODE pNewElement)
@@ -1366 +1366 @@
  */
 
-static PDOMSTACKITEM PopElementStack(PXMLDOM pDom,
+STATIC PDOMSTACKITEM PopElementStack(PXMLDOM pDom,
                                      PLISTNODE *ppListNode)
 {
@@ -1396 +1396 @@
  */
 
-static VOID PushElementStack(PXMLDOM pDom,
+STATIC VOID PushElementStack(PXMLDOM pDom,
                              PDOMNODE pDomNode)
 {
@@ -1436 +1436 @@
  */
 
-static int EXPATENTRY UnknownEncodingHandler(void *pUserData,   // in: out PXMLDOM really
+STATIC int EXPATENTRY UnknownEncodingHandler(void *pUserData,   // in: out PXMLDOM really
                                              const XML_Char *pcszName,
                                              XML_Encoding *pEncoding)
@@ -1501 +1501 @@
  */
 
-static void EXPATENTRY StartElementHandler(void *pUserData,      // in: our PXMLDOM really
+STATIC void EXPATENTRY StartElementHandler(void *pUserData,      // in: our PXMLDOM really
                                            const char *pcszElement,
                                            const char **papcszAttribs)
@@ -1596 +1596 @@
  */
 
-static void EXPATENTRY EndElementHandler(void *pUserData,      // in: our PXMLDOM really
+STATIC void EXPATENTRY EndElementHandler(void *pUserData,      // in: our PXMLDOM really
                                          const XML_Char *name)
 {
@@ -1632 +1632 @@
  */
 
-static void EXPATENTRY CharacterDataHandler(void *pUserData,      // in: our PXMLDOM really
+STATIC void EXPATENTRY CharacterDataHandler(void *pUserData,      // in: our PXMLDOM really
                                             const XML_Char *s,
                                             int len)
@@ -1743 +1743 @@
  */
 
-static void EXPATENTRY CommentHandler(void *pUserData,      // in: our PXMLDOM really
+STATIC void EXPATENTRY CommentHandler(void *pUserData,      // in: our PXMLDOM really
                                       const XML_Char *data)
 {
@@ -1778 +1778 @@
  */
 
-static void EXPATENTRY StartDoctypeDeclHandler(void *pUserData,
+STATIC void EXPATENTRY StartDoctypeDeclHandler(void *pUserData,
                                                const XML_Char *pcszDoctypeName,
                                                const XML_Char *pcszSysid,
@@ -1817 +1817 @@
  */
 
-static void EXPATENTRY EndDoctypeDeclHandler(void *pUserData)      // in: our PXMLDOM really
+STATIC void EXPATENTRY EndDoctypeDeclHandler(void *pUserData)      // in: our PXMLDOM really
 {
     PXMLDOM     pDom = (PXMLDOM)pUserData;
@@ -1836 +1836 @@
  */
 
-static void EXPATENTRY NotationDeclHandler(void *pUserData,      // in: our PXMLDOM really
+STATIC void EXPATENTRY NotationDeclHandler(void *pUserData,      // in: our PXMLDOM really
                                            const XML_Char *pcszNotationName,
                                            const XML_Char *pcszBase,
@@ -1905 +1905 @@
  */
 
-static int EXPATENTRY ExternalEntityRefHandler(void *pUserData,      // in: our PXMLDOM really
+STATIC int EXPATENTRY ExternalEntityRefHandler(void *pUserData,      // in: our PXMLDOM really
                                                XML_Parser parser,
                                                const XML_Char *pcszContext,
@@ -2027 +2027 @@
  */
 
-static void EXPATENTRY ElementDeclHandler(void *pUserData,      // in: our PXMLDOM really
+STATIC void EXPATENTRY ElementDeclHandler(void *pUserData,      // in: our PXMLDOM really
                                           const XML_Char *pcszName,
                                           XMLCONTENT *pModel)
@@ -2077 +2077 @@
  */
 
-static APIRET AddEnum(PCMATTRIBUTEDECL pDecl,
+STATIC APIRET AddEnum(PCMATTRIBUTEDECL pDecl,
                       const char *p,           // in: start of name
                       const char *pNext)       // in: end of name (not included)
@@ -2126 +2126 @@
  */
 
-static void EXPATENTRY AttlistDeclHandler(void *pUserData,      // in: our PXMLDOM really
+STATIC void EXPATENTRY AttlistDeclHandler(void *pUserData,      // in: our PXMLDOM really
                                           const XML_Char *pcszElementName,
                                           const XML_Char *pcszAttribName,
@@ -2305 +2305 @@
  */
 
-static void EXPATENTRY EntityDeclHandler(void *pUserData,      // in: our PXMLDOM really
+STATIC void EXPATENTRY EntityDeclHandler(void *pUserData,      // in: our PXMLDOM really
                                          const XML_Char *pcszEntityName,
                                          int fIsParameterEntity,
@@ -2653 +2653 @@
  */
 
-static VOID Dump(int iIndent,
+STATIC VOID Dump(int iIndent,
                  PDOMNODE pDomNode)
 {
@@ -3188 +3188 @@
  */
 
-static VOID WriteNodes(PXSTRING pxstr,
+STATIC VOID WriteNodes(PXSTRING pxstr,
                        PESCAPES pEscapes,
                        PDOMNODE pDomNode)       // in: node whose children are to be written (initially DOCUMENT)

trunk/src/helpers/xmlparse.c

@@ -324 +324 @@
                            const char **endPtr);
 
-static Processor prologProcessor;
-static Processor prologInitProcessor;
-static Processor contentProcessor;
-static Processor cdataSectionProcessor;
+STATIC Processor prologProcessor;
+STATIC Processor prologInitProcessor;
+STATIC Processor contentProcessor;
+STATIC Processor cdataSectionProcessor;
 
 #ifdef XML_DTD
-static Processor ignoreSectionProcessor;
+STATIC Processor ignoreSectionProcessor;
 
 #endif /* XML_DTD */
-static Processor epilogProcessor;
-static Processor errorProcessor;
-static Processor externalEntityInitProcessor;
-static Processor externalEntityInitProcessor2;
-static Processor externalEntityInitProcessor3;
-static Processor externalEntityContentProcessor;
-
-static XMLERROR
+STATIC Processor epilogProcessor;
+STATIC Processor errorProcessor;
+STATIC Processor externalEntityInitProcessor;
+STATIC Processor externalEntityInitProcessor2;
+STATIC Processor externalEntityInitProcessor3;
+STATIC Processor externalEntityContentProcessor;
+
+STATIC XMLERROR
  handleUnknownEncoding(XML_Parser parser, const XML_Char * encodingName);
-static XMLERROR
+STATIC XMLERROR
  processXmlDecl(XML_Parser parser, int isGeneralTextEntity, const char *, const char *);
-static XMLERROR
+STATIC XMLERROR
  initializeEncoding(XML_Parser parser);
-static XMLERROR
+STATIC XMLERROR
  doProlog(XML_Parser parser, const ENCODING * enc, const char *s,
           const char *end, int tok, const char *next, const char **nextPtr);
-static XMLERROR
+STATIC XMLERROR
  processInternalParamEntity(XML_Parser parser, ENTITY * entity);
-static XMLERROR
+STATIC XMLERROR
  doContent(XML_Parser parser, int startTagLevel, const ENCODING * enc,
            const char *start, const char *end, const char **endPtr);
-static XMLERROR
+STATIC XMLERROR
  doCdataSection(XML_Parser parser, const ENCODING *, const char **startPtr, const char *end, const char **nextPtr);
 
 #ifdef XML_DTD
-static XMLERROR
+STATIC XMLERROR
  doIgnoreSection(XML_Parser parser, const ENCODING *, const char **startPtr, const char *end, const char **nextPtr);
 
 #endif /* XML_DTD */
-static XMLERROR storeAtts(XML_Parser parser, const ENCODING *, const char *s,
+STATIC XMLERROR storeAtts(XML_Parser parser, const ENCODING *, const char *s,
                           TAG_NAME * tagNamePtr, BINDING ** bindingsPtr);
-static
+STATIC
 int addBinding(XML_Parser parser, PREFIX * prefix, const ATTRIBUTE_ID * attId, const XML_Char * uri, BINDING ** bindingsPtr);
 
-static int
+STATIC int
  defineAttribute(ELEMENT_TYPE * type, ATTRIBUTE_ID *,
                  int isCdata, int isId, const XML_Char * dfltValue,
                  XML_Parser parser);
 
-static XMLERROR
+STATIC XMLERROR
  storeAttributeValue(XML_Parser parser, const ENCODING *, int isCdata, const char *, const char *,
                      STRING_POOL *);
-static XMLERROR
+STATIC XMLERROR
  appendAttributeValue(XML_Parser parser, const ENCODING *, int isCdata, const char *, const char *,
                       STRING_POOL *);
-static ATTRIBUTE_ID *
+STATIC ATTRIBUTE_ID *
  getAttributeId(XML_Parser parser, const ENCODING * enc, const char *start, const char *end);
-static int setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *);
-static XMLERROR
+STATIC int setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *);
+STATIC XMLERROR
  storeEntityValue(XML_Parser parser, const ENCODING * enc, const char *start, const char *end);
-static int
+STATIC int
  reportProcessingInstruction(XML_Parser parser, const ENCODING * enc, const char *start, const char *end);
-static int
+STATIC int
  reportComment(XML_Parser parser, const ENCODING * enc, const char *start, const char *end);
-static void
+STATIC void
  reportDefault(XML_Parser parser, const ENCODING * enc, const char *start, const char *end);
 
-static const XML_Char *getContext(XML_Parser parser);
-static int setContext(XML_Parser parser, const XML_Char * context);
-static void normalizePublicId(XML_Char * s);
-static int dtdInit(DTD *, XML_Parser parser);
-
-static void dtdDestroy(DTD *, XML_Parser parser);
-
-static int dtdCopy(DTD * newDtd, const DTD * oldDtd, XML_Parser parser);
-
-static int copyEntityTable(HASH_TABLE *, STRING_POOL *, const HASH_TABLE *,
+STATIC const XML_Char *getContext(XML_Parser parser);
+STATIC int setContext(XML_Parser parser, const XML_Char * context);
+STATIC void normalizePublicId(XML_Char * s);
+STATIC int dtdInit(DTD *, XML_Parser parser);
+
+STATIC void dtdDestroy(DTD *, XML_Parser parser);
+
+STATIC int dtdCopy(DTD * newDtd, const DTD * oldDtd, XML_Parser parser);
+
+STATIC int copyEntityTable(HASH_TABLE *, STRING_POOL *, const HASH_TABLE *,
                            XML_Parser parser);
 
 #ifdef XML_DTD
-static void dtdSwap(DTD *, DTD *);
+STATIC void dtdSwap(DTD *, DTD *);
 
 #endif /* XML_DTD */
 
-static NAMED *lookup(HASH_TABLE * table, KEY name, size_t createSize);
-
-static void hashTableInit(HASH_TABLE *, XML_Memory_Handling_Suite * ms);
-
-static void hashTableDestroy(HASH_TABLE *);
-static void hashTableIterInit(HASH_TABLE_ITER *, const HASH_TABLE *);
-static NAMED *hashTableIterNext(HASH_TABLE_ITER *);
-static void poolInit(STRING_POOL *, XML_Memory_Handling_Suite * ms);
-static void poolClear(STRING_POOL *);
-static void poolDestroy(STRING_POOL *);
-static XML_Char *poolAppend(STRING_POOL *pool,
+STATIC NAMED *lookup(HASH_TABLE * table, KEY name, size_t createSize);
+
+STATIC void hashTableInit(HASH_TABLE *, XML_Memory_Handling_Suite * ms);
+
+STATIC void hashTableDestroy(HASH_TABLE *);
+STATIC void hashTableIterInit(HASH_TABLE_ITER *, const HASH_TABLE *);
+STATIC NAMED *hashTableIterNext(HASH_TABLE_ITER *);
+STATIC void poolInit(STRING_POOL *, XML_Memory_Handling_Suite * ms);
+STATIC void poolClear(STRING_POOL *);
+STATIC void poolDestroy(STRING_POOL *);
+STATIC XML_Char *poolAppend(STRING_POOL *pool,
                             const ENCODING *enc,
                             const char *ptr,
                             const char *end,
                             unsigned long *pulOfs); // V0.9.14 (2001-08-09) [umoeller]
-static XML_Char *poolStoreString(STRING_POOL *pool,
+STATIC XML_Char *poolStoreString(STRING_POOL *pool,
                                  const ENCODING *enc,
                                  const char *ptr,
@@ -428 +428 @@
                                  unsigned long *pulOfs); // V0.9.14 (2001-08-09) [umoeller]
 
-static int poolGrow(STRING_POOL * pool);
-
-static int nextScaffoldPart(XML_Parser parser);
-static XMLCONTENT *build_model(XML_Parser parser);
-
-static const XML_Char *poolCopyString(STRING_POOL * pool, const XML_Char * s);
-static const XML_Char *poolCopyStringN(STRING_POOL * pool, const XML_Char * s, int n);
-static const XML_Char *poolAppendString(STRING_POOL * pool, const XML_Char * s);
-static ELEMENT_TYPE *getElementType(XML_Parser Paraser,
+STATIC int poolGrow(STRING_POOL * pool);
+
+STATIC int nextScaffoldPart(XML_Parser parser);
+STATIC XMLCONTENT *build_model(XML_Parser parser);
+
+STATIC const XML_Char *poolCopyString(STRING_POOL * pool, const XML_Char * s);
+STATIC const XML_Char *poolCopyStringN(STRING_POOL * pool, const XML_Char * s, int n);
+STATIC const XML_Char *poolAppendString(STRING_POOL * pool, const XML_Char * s);
+STATIC ELEMENT_TYPE *getElementType(XML_Parser Paraser,
                                     const ENCODING * enc,
                                     const char *ptr,
@@ -1142 +1142 @@
 }
 
-static void destroyBindings(BINDING * bindings,
+STATIC void destroyBindings(BINDING * bindings,
                             XML_Parser parser)
 {
@@ -2489 +2489 @@
  * } */
 
-static XMLERROR contentProcessor(XML_Parser parser,
+STATIC XMLERROR contentProcessor(XML_Parser parser,
                                  const char *start,
                                  const char *end,
@@ -2497 +2497 @@
 }
 
-static XMLERROR externalEntityInitProcessor(XML_Parser parser,
+STATIC XMLERROR externalEntityInitProcessor(XML_Parser parser,
                                             const char *start,
                                             const char *end,
@@ -2510 +2510 @@
 }
 
-static XMLERROR externalEntityInitProcessor2(XML_Parser parser,
+STATIC XMLERROR externalEntityInitProcessor2(XML_Parser parser,
                                              const char *start,
                                              const char *end,
@@ -2544 +2544 @@
 }
 
-static XMLERROR externalEntityInitProcessor3(XML_Parser parser,
+STATIC XMLERROR externalEntityInitProcessor3(XML_Parser parser,
                                              const char *start,
                                              const char *end,
@@ -2585 +2585 @@
 }
 
-static XMLERROR externalEntityContentProcessor(XML_Parser parser,
+STATIC XMLERROR externalEntityContentProcessor(XML_Parser parser,
                                                const char *start,
                                                const char *end,
@@ -2599 +2599 @@
  */
 
-static XMLERROR doContent(XML_Parser parser,
+STATIC XMLERROR doContent(XML_Parser parser,
                           int startTagLevel,
                           const ENCODING * enc,
@@ -3109 +3109 @@
  * otherwise just check the attributes for well-formedness. */
 
-static XMLERROR storeAtts(XML_Parser parser,
+STATIC XMLERROR storeAtts(XML_Parser parser,
                           const ENCODING * enc,
                           const char *attStr,
@@ -3391 +3391 @@
 }
 
-static int addBinding(XML_Parser parser,
+STATIC int addBinding(XML_Parser parser,
                       PREFIX * prefix,
                       const ATTRIBUTE_ID * attId,
@@ -3451 +3451 @@
  * the whole file is parsed with one call. */
 
-static XMLERROR cdataSectionProcessor(XML_Parser parser,
+STATIC XMLERROR cdataSectionProcessor(XML_Parser parser,
                                       const char *start,
                                       const char *end,
@@ -3469 +3469 @@
  * the section is not yet closed. */
 
-static XMLERROR doCdataSection(XML_Parser parser,
+STATIC XMLERROR doCdataSection(XML_Parser parser,
                                const ENCODING * enc,
                                const char **startPtr,
@@ -3579 +3579 @@
  * the whole file is parsed with one call. */
 
-static XMLERROR ignoreSectionProcessor(XML_Parser parser,
+STATIC XMLERROR ignoreSectionProcessor(XML_Parser parser,
                                        const char *start,
                                        const char *end,
@@ -3597 +3597 @@
  * the section is not yet closed. */
 
-static XMLERROR doIgnoreSection(XML_Parser parser,
+STATIC XMLERROR doIgnoreSection(XML_Parser parser,
                                 const ENCODING * enc,
                                 const char **startPtr,
@@ -3658 +3658 @@
 #endif /* XML_DTD */
 
-static XMLERROR initializeEncoding(XML_Parser parser)
+STATIC XMLERROR initializeEncoding(XML_Parser parser)
 {
     const char *s;
@@ -3692 +3692 @@
 }
 
-static XMLERROR  processXmlDecl(XML_Parser parser,
+STATIC XMLERROR  processXmlDecl(XML_Parser parser,
                                 int isGeneralTextEntity,
                                 const char *s,
@@ -3794 +3794 @@
 }
 
-static XMLERROR  handleUnknownEncoding(XML_Parser parser,
+STATIC XMLERROR  handleUnknownEncoding(XML_Parser parser,
                                        const XML_Char * encodingName)
 {
@@ -3838 +3838 @@
 }
 
-static XMLERROR prologInitProcessor(XML_Parser parser,
+STATIC XMLERROR prologInitProcessor(XML_Parser parser,
                                     const char *s,
                                     const char *end,
@@ -3851 +3851 @@
 }
 
-static XMLERROR prologProcessor(XML_Parser parser,
+STATIC XMLERROR prologProcessor(XML_Parser parser,
                                 const char *s,
                                 const char *end,
@@ -3862 +3862 @@
 }
 
-static XMLERROR doProlog(XML_Parser parser,
+STATIC XMLERROR doProlog(XML_Parser parser,
                          const ENCODING * enc,
                          const char *s,
@@ -4709 +4709 @@
 }
 
-static XMLERROR epilogProcessor(XML_Parser parser,
+STATIC XMLERROR epilogProcessor(XML_Parser parser,
                                 const char *s,
                                 const char *end,
@@ -4773 +4773 @@
 #ifdef XML_DTD
 
-static XMLERROR processInternalParamEntity(XML_Parser parser,
+STATIC XMLERROR processInternalParamEntity(XML_Parser parser,
                                            ENTITY * entity)
 {
@@ -4798 +4798 @@
 #endif /* XML_DTD */
 
-static XMLERROR errorProcessor(XML_Parser parser,
+STATIC XMLERROR errorProcessor(XML_Parser parser,
                                const char *s,
                                const char *end,
@@ -4806 +4806 @@
 }
 
-static XMLERROR storeAttributeValue(XML_Parser parser,
+STATIC XMLERROR storeAttributeValue(XML_Parser parser,
                                     const ENCODING * enc,
                                     int isCdata,
@@ -4831 +4831 @@
  */
 
-static XMLERROR appendAttributeValue(XML_Parser parser,
+STATIC XMLERROR appendAttributeValue(XML_Parser parser,
                                      const ENCODING * enc,
                                      int isCdata,
@@ -4975 +4975 @@
 }
 
-static XMLERROR storeEntityValue(XML_Parser parser,
+STATIC XMLERROR storeEntityValue(XML_Parser parser,
                                  const ENCODING * enc,
                                  const char *entityTextPtr,
@@ -5096 +5096 @@
 }
 
-static void  normalizeLines(XML_Char * s)
+STATIC void  normalizeLines(XML_Char * s)
 {
     XML_Char *p;
@@ -5123 +5123 @@
 }
 
-static int reportProcessingInstruction(XML_Parser parser,
+STATIC int reportProcessingInstruction(XML_Parser parser,
                                        const ENCODING * enc,
                                        const char *start,
@@ -5156 +5156 @@
 }
 
-static int reportComment(XML_Parser parser,
+STATIC int reportComment(XML_Parser parser,
                          const ENCODING * enc,
                          const char *start,
@@ -5182 +5182 @@
 }
 
-static void reportDefault(XML_Parser parser,
+STATIC void reportDefault(XML_Parser parser,
                           const ENCODING * enc,
                           const char *s,
@@ -5218 +5218 @@
 
 
-static int defineAttribute(ELEMENT_TYPE * type,
+STATIC int defineAttribute(ELEMENT_TYPE * type,
                            ATTRIBUTE_ID * attId,
                            int isCdata,
@@ -5265 +5265 @@
 }
 
-static int setElementTypePrefix(XML_Parser parser,
+STATIC int setElementTypePrefix(XML_Parser parser,
                                 ELEMENT_TYPE * elementType)
 {
@@ -5298 +5298 @@
 }
 
-static ATTRIBUTE_ID * getAttributeId(XML_Parser parser,
+STATIC ATTRIBUTE_ID * getAttributeId(XML_Parser parser,
                                      const ENCODING * enc,
                                      const char *start,
@@ -5367 +5367 @@
 #define CONTEXT_SEP XML_T('\f')
 
-static const XML_Char *getContext(XML_Parser parser)
+STATIC const XML_Char *getContext(XML_Parser parser)
 {
     HASH_TABLE_ITER iter;
@@ -5440 +5440 @@
 }
 
-static int setContext(XML_Parser parser,
+STATIC int setContext(XML_Parser parser,
                       const XML_Char * context)
 {
@@ -5505 +5505 @@
 
 
-static void normalizePublicId(XML_Char * publicId)
+STATIC void normalizePublicId(XML_Char * publicId)
 {
     XML_Char *p = publicId;
@@ -5529 +5529 @@
 }
 
-static int dtdInit(DTD * p,
+STATIC int dtdInit(DTD * p,
                    XML_Parser parser)
 {
@@ -5560 +5560 @@
 #ifdef XML_DTD
 
-static void dtdSwap(DTD * p1, DTD * p2)
+STATIC void dtdSwap(DTD * p1, DTD * p2)
 {
     DTD tem;
@@ -5571 +5571 @@
 #endif /* XML_DTD */
 
-static void dtdDestroy(DTD * p, XML_Parser parser)
+STATIC void dtdDestroy(DTD * p, XML_Parser parser)
 {
     HASH_TABLE_ITER iter;
@@ -5602 +5602 @@
  * The new DTD has already been initialized. */
 
-static int dtdCopy(DTD * newDtd, const DTD * oldDtd, XML_Parser parser)
+STATIC int dtdCopy(DTD * newDtd, const DTD * oldDtd, XML_Parser parser)
 {
     HASH_TABLE_ITER iter;
@@ -5728 +5728 @@
 }                               /* End dtdCopy */
 
-static int copyEntityTable(HASH_TABLE * newTable,
+STATIC int copyEntityTable(HASH_TABLE * newTable,
                            STRING_POOL * newPool,
                            const HASH_TABLE * oldTable,
@@ -5797 +5797 @@
 #define INIT_SIZE 64
 
-static int keyeq(KEY s1, KEY s2)
+STATIC int keyeq(KEY s1, KEY s2)
 {
     for (; *s1 == *s2; s1++, s2++)
@@ -5805 +5805 @@
 }
 
-static unsigned long hash(KEY s)
+STATIC unsigned long hash(KEY s)
 {
     unsigned long h = 0;
@@ -5814 +5814 @@
 }
 
-static NAMED *lookup(HASH_TABLE * table,
+STATIC NAMED *lookup(HASH_TABLE * table,
                      KEY name,
                      size_t createSize)
@@ -5888 +5888 @@
 }
 
-static void hashTableDestroy(HASH_TABLE * table)
+STATIC void hashTableDestroy(HASH_TABLE * table)
 {
     size_t i;
@@ -5903 +5903 @@
 }
 
-static void hashTableInit(HASH_TABLE * p, XML_Memory_Handling_Suite * ms)
+STATIC void hashTableInit(HASH_TABLE * p, XML_Memory_Handling_Suite * ms)
 {
     p->size = 0;
@@ -5912 +5912 @@
 }
 
-static void hashTableIterInit(HASH_TABLE_ITER * iter, const HASH_TABLE * table)
+STATIC void hashTableIterInit(HASH_TABLE_ITER * iter, const HASH_TABLE * table)
 {
     iter->p = table->v;
@@ -5918 +5918 @@
 }
 
-static NAMED *hashTableIterNext(HASH_TABLE_ITER * iter)
+STATIC NAMED *hashTableIterNext(HASH_TABLE_ITER * iter)
 {
     while (iter->p != iter->end)
@@ -5931 +5931 @@
 
 
-static void poolInit(STRING_POOL * pool, XML_Memory_Handling_Suite * ms)
+STATIC void poolInit(STRING_POOL * pool, XML_Memory_Handling_Suite * ms)
 {
     pool->blocks = 0;
@@ -5941 +5941 @@
 }
 
-static void poolClear(STRING_POOL * pool)
+STATIC void poolClear(STRING_POOL * pool)
 {
     if (!pool->freeBlocks)
@@ -5964 +5964 @@
 }
 
-static void poolDestroy(STRING_POOL * pool)
+STATIC void poolDestroy(STRING_POOL * pool)
 {
     BLOCK *p = pool->blocks;
@@ -6012 +6012 @@
  */
 
-static XML_Char* poolAppend(STRING_POOL * pool,
+STATIC XML_Char* poolAppend(STRING_POOL * pool,
                             const ENCODING * enc,
                             const char *ptr,
@@ -6045 +6045 @@
 }
 
-static const XML_Char* poolCopyString(STRING_POOL *pool,
+STATIC const XML_Char* poolCopyString(STRING_POOL *pool,
                                       const XML_Char *s)
 {
@@ -6059 +6059 @@
 }
 
-static const XML_Char *poolCopyStringN(STRING_POOL * pool, const XML_Char * s, int n)
+STATIC const XML_Char *poolCopyStringN(STRING_POOL * pool, const XML_Char * s, int n)
 {
     if (!pool->ptr && !poolGrow(pool))
@@ -6074 +6074 @@
 }
 
-static const XML_Char* poolAppendString(STRING_POOL *pool,
+STATIC const XML_Char* poolAppendString(STRING_POOL *pool,
                                         const XML_Char *s)
 {
@@ -6092 +6092 @@
  */
 
-static XML_Char* poolStoreString(STRING_POOL *pool,
+STATIC XML_Char* poolStoreString(STRING_POOL *pool,
                                  const ENCODING *enc,
                                  const char *ptr,
@@ -6112 +6112 @@
 }
 
-static int poolGrow(STRING_POOL *pool)
+STATIC int poolGrow(STRING_POOL *pool)
 {
     if (pool->freeBlocks)
@@ -6178 +6178 @@
 }
 
-static int nextScaffoldPart(XML_Parser parser)
+STATIC int nextScaffoldPart(XML_Parser parser)
 {
     CONTENT_SCAFFOLD *me;
@@ -6227 +6227 @@
 }                               /* End nextScaffoldPart */
 
-static void  build_node(XML_Parser parser,
+STATIC void  build_node(XML_Parser parser,
                         int src_node,
                         XMLCONTENT * dest,
@@ -6269 +6269 @@
 }                               /* End build_node */
 
-static XMLCONTENT * build_model(XML_Parser parser)
+STATIC XMLCONTENT * build_model(XML_Parser parser)
 {
     XMLCONTENT *ret;
@@ -6287 +6287 @@
 }                               /* End build_model */
 
-static ELEMENT_TYPE * getElementType(XML_Parser parser,
+STATIC ELEMENT_TYPE * getElementType(XML_Parser parser,
                                      const ENCODING * enc,
                                      const char *ptr,

trunk/src/helpers/xprf.c

@@ -157 +157 @@
  */
 
-static PXINIAPPDATA FindApp(PXINI pXIni,           // in: profile opened with xprfOpenProfile
+STATIC PXINIAPPDATA FindApp(PXINI pXIni,           // in: profile opened with xprfOpenProfile
                             const char *pcszApp)
 {
@@ -183 +183 @@
  */
 
-static PXINIAPPDATA CreateApp(PXINI pXIni,         // in: profile opened with xprfOpenProfile
+STATIC PXINIAPPDATA CreateApp(PXINI pXIni,         // in: profile opened with xprfOpenProfile
                               const char *pcszApp)
 {
@@ -210 +210 @@
  */
 
-static PXINIKEYDATA FindKey(PXINIAPPDATA pAppData,
+STATIC PXINIKEYDATA FindKey(PXINIAPPDATA pAppData,
                             const char *pcszKey)
 {
@@ -236 +236 @@
  */
 
-static PXINIKEYDATA CreateKey(PXINIAPPDATA pAppData,
+STATIC PXINIKEYDATA CreateKey(PXINIAPPDATA pAppData,
                               const char *pcszKey,     // in: key name
                               PBYTE pbData,            // in: data for key
@@ -274 +274 @@
  */
 
-static VOID FreeKey(PXINIKEYDATA pKeyDataThis)
+STATIC VOID FreeKey(PXINIKEYDATA pKeyDataThis)
 {
     if (pKeyDataThis->pszKeyName)
@@ -292 +292 @@
  */
 
-static VOID FreeApp(PXINIAPPDATA pAppDataThis)
+STATIC VOID FreeApp(PXINIAPPDATA pAppDataThis)
 {
     PLISTNODE pKeyNode = lstQueryFirstNode(&pAppDataThis->llKeys);
@@ -319 +319 @@
  */
 
-static BOOL FreeINI(PXINI pXIni)       // in: profile opened with xprfOpenProfile
+STATIC BOOL FreeINI(PXINI pXIni)       // in: profile opened with xprfOpenProfile
 {
     BOOL brc = FALSE;
@@ -356 +356 @@
  */
 
-static BOOL ReadINI(PXINI pXIni)       // in: profile opened with xprfOpenProfile
+STATIC BOOL ReadINI(PXINI pXIni)       // in: profile opened with xprfOpenProfile
 {
     BOOL brc = FALSE;
@@ -457 +457 @@
  */
 
-static BOOL WriteINI(PXINI pXIni)      // in: profile opened with xprfOpenProfile
+STATIC BOOL WriteINI(PXINI pXIni)      // in: profile opened with xprfOpenProfile
 {
     BOOL    brc = FALSE;

trunk/src/helpers/xstring.c

@@ -1255 +1255 @@
 
 // static encoding table for xstrEncode
-static PSZ apszEncoding[] =
+STATIC PSZ apszEncoding[] =
 {
     "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",