fix some more -Wmissing-declarations warnings

Stefan Huehner stefan at huehner.org
Wed Jul 6 04:10:11 CDT 2005


Hi,

next patch which makes functions static which aren't used outside its
source file.

ChangeLog:
- make functions static to fix -Wmissing-declarations warnings

Regards,
Stefan
-------------- next part --------------
Index: dlls/riched20/paint.c
===================================================================
RCS file: /home/wine/wine/dlls/riched20/paint.c,v
retrieving revision 1.11
diff -u -p -r1.11 paint.c
--- dlls/riched20/paint.c	12 Jun 2005 10:43:24 -0000	1.11
+++ dlls/riched20/paint.c	6 Jul 2005 09:04:47 -0000
@@ -94,7 +94,7 @@ void ME_PaintContent(ME_TextEditor *edit
   ME_DestroyContext(&c);
 }
 
-void ME_MarkParagraphRange(ME_TextEditor *editor, ME_DisplayItem *p1,
+static void ME_MarkParagraphRange(ME_TextEditor *editor, ME_DisplayItem *p1,
                            ME_DisplayItem *p2, int nFlags)
 {
   ME_DisplayItem *p3;  
@@ -113,7 +113,7 @@ void ME_MarkParagraphRange(ME_TextEditor
   } while (p1 != p2);
 }
 
-void ME_MarkOffsetRange(ME_TextEditor *editor, int from, int to, int nFlags)
+static void ME_MarkOffsetRange(ME_TextEditor *editor, int from, int to, int nFlags)
 {
   ME_Cursor c1, c2;
   ME_CursorFromCharOfs(editor, from, &c1);
@@ -122,7 +122,7 @@ void ME_MarkOffsetRange(ME_TextEditor *e
   ME_MarkParagraphRange(editor, ME_GetParagraph(c1.pRun), ME_GetParagraph(c2.pRun), nFlags);
 }
 
-void ME_MarkSelectionForRepaint(ME_TextEditor *editor)
+static void ME_MarkSelectionForRepaint(ME_TextEditor *editor)
 {
   int from, to, from2, to2, end;
   
@@ -173,7 +173,7 @@ void ME_UpdateRepaint(ME_TextEditor *edi
   ME_SendSelChange(editor);
 }
 
-void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, int nChars, 
+static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, int nChars, 
   ME_Style *s, int *width, int nSelFrom, int nSelTo, int ymin, int cy) {
   HDC hDC = c->hDC;
   HGDIOBJ hOldFont;
@@ -214,7 +214,7 @@ void ME_DrawTextWithStyle(ME_Context *c,
   ME_UnselectStyleFont(c->editor, hDC, s, hOldFont);
 }
 
-void ME_DebugWrite(HDC hDC, POINT *pt, WCHAR *szText) {
+static void ME_DebugWrite(HDC hDC, POINT *pt, WCHAR *szText) {
   int align = SetTextAlign(hDC, TA_LEFT|TA_TOP);
   HGDIOBJ hFont = SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT));
   COLORREF color = SetTextColor(hDC, RGB(128,128,128));
@@ -252,7 +252,7 @@ void ME_DrawGraphics(ME_Context *c, int 
   }
 }
 
-void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Paragraph *para) {
+static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Paragraph *para) {
   ME_Run *run = &rundi->member.run;
   int runofs = run->nCharOfs+para->nCharOfs;
   
Index: dlls/riched20/wrap.c
===================================================================
RCS file: /home/wine/wine/dlls/riched20/wrap.c,v
retrieving revision 1.9
diff -u -p -r1.9 wrap.c
--- dlls/riched20/wrap.c	5 Jul 2005 20:56:14 -0000	1.9
+++ dlls/riched20/wrap.c	6 Jul 2005 09:04:47 -0000
@@ -42,7 +42,7 @@ ME_DisplayItem *ME_MakeRow(int height, i
   return item;
 }
 
-void ME_BeginRow(ME_WrapContext *wc)
+static void ME_BeginRow(ME_WrapContext *wc)
 {
   wc->pRowStart = NULL;
   wc->bOverflown = FALSE;
@@ -91,7 +91,7 @@ void ME_InsertRowStart(ME_WrapContext *w
   ME_BeginRow(wc);
 }
 
-void ME_WrapEndParagraph(ME_WrapContext *wc, ME_DisplayItem *p)
+static void ME_WrapEndParagraph(ME_WrapContext *wc, ME_DisplayItem *p)
 {
   if (wc->pRowStart)
     ME_InsertRowStart(wc, p->next);
@@ -111,7 +111,7 @@ void ME_WrapEndParagraph(ME_WrapContext 
   */
 }
 
-void ME_WrapSizeRun(ME_WrapContext *wc, ME_DisplayItem *p)
+static void ME_WrapSizeRun(ME_WrapContext *wc, ME_DisplayItem *p)
 {
   /* FIXME compose style (out of character and paragraph styles) here */
 
@@ -120,7 +120,7 @@ void ME_WrapSizeRun(ME_WrapContext *wc, 
   ME_CalcRunExtent(wc->context, &ME_GetParagraph(p)->member.para, &p->member.run);
 }
 
-ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, int i)
+static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, int i)
 {
   ME_DisplayItem *pp, *piter = p;
   int j;
@@ -162,7 +162,7 @@ ME_DisplayItem *ME_MaximizeSplit(ME_Wrap
   }
 }
 
-ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem *p, int loc)
+static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem *p, int loc)
 {
   ME_DisplayItem *piter = p, *pp;
   int i, idesp, len;
@@ -242,7 +242,7 @@ ME_DisplayItem *ME_SplitByBacktracking(M
   }
 }
 
-ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
+static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
 {
   ME_DisplayItem *pp;
   ME_Run *run;
-------------- next part --------------
Index: dlls/twain/capability.c
===================================================================
RCS file: /home/wine/wine/dlls/twain/capability.c,v
retrieving revision 1.4
diff -u -p -r1.4 capability.c
--- dlls/twain/capability.c	13 Sep 2004 18:06:46 -0000	1.4
+++ dlls/twain/capability.c	6 Jul 2005 09:05:36 -0000
@@ -175,7 +175,7 @@ TW_UINT16 TWAIN_SaneCapability (activeDS
     return twCC;
 }
 
-TW_BOOL TWAIN_OneValueSet (pTW_CAPABILITY pCapability, TW_UINT32 value)
+static TW_BOOL TWAIN_OneValueSet (pTW_CAPABILITY pCapability, TW_UINT32 value)
 {
     pCapability->hContainer = (TW_HANDLE)GlobalAlloc (0, sizeof(TW_ONEVALUE));
 
@@ -191,7 +191,7 @@ TW_BOOL TWAIN_OneValueSet (pTW_CAPABILIT
         return FALSE;
 }
 
-TW_BOOL TWAIN_OneValueGet (pTW_CAPABILITY pCapability, TW_UINT32 *pValue)
+static TW_BOOL TWAIN_OneValueGet (pTW_CAPABILITY pCapability, TW_UINT32 *pValue)
 {
     pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer);
 
-------------- next part --------------
Index: dlls/x11drv/xfont.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/xfont.c,v
retrieving revision 1.20
diff -u -p -r1.20 xfont.c
--- dlls/x11drv/xfont.c	22 Jun 2005 12:02:47 -0000	1.20
+++ dlls/x11drv/xfont.c	6 Jul 2005 09:05:58 -0000
@@ -2870,7 +2870,7 @@ static int XFONT_ReleaseCacheEntry(const
  *
  * Initialize font resource list and allocate font cache.
  */
-void X11DRV_FONT_InitX11Metrics( void )
+static void X11DRV_FONT_InitX11Metrics( void )
 {
   char**    x_pattern;
   unsigned  x_checksum;
Index: dlls/x11drv/xrandr.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/xrandr.c,v
retrieving revision 1.9
diff -u -p -r1.9 xrandr.c
--- dlls/x11drv/xrandr.c	28 Apr 2005 18:29:12 -0000	1.9
+++ dlls/x11drv/xrandr.c	6 Jul 2005 09:05:58 -0000
@@ -82,7 +82,7 @@ static unsigned int real_xrandr_sizes_co
 static int *real_xrandr_rates_count;
 static unsigned int real_xrandr_modes_count;
 
-int load_xrandr(void)
+static int load_xrandr(void)
 {
     int r = 0;
 
Index: dlls/x11drv/xrender.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/xrender.c,v
retrieving revision 1.63
diff -u -p -r1.63 xrender.c
--- dlls/x11drv/xrender.c	20 Apr 2005 15:18:42 -0000	1.63
+++ dlls/x11drv/xrender.c	6 Jul 2005 09:05:58 -0000
@@ -84,7 +84,7 @@ typedef struct
     LFANDSIZE lfsz;
     AA_Type aa_default;
     gsCacheEntryFormat * format[AA_MAXVALUE];
-    UINT count;
+    INT count;
     INT next;
 } gsCacheEntry;
 


More information about the wine-patches mailing list