ddraw: Declare some functions static
Andrew Talbot
Andrew.Talbot at talbotville.com
Thu Jan 4 11:07:43 CST 2007
Note: These are in addition to those submitted yesterday.
-- Andy.
---
Changelog:
ddraw: Declare some functions static.
diff -urN a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
--- a/dlls/ddraw/ddraw_private.h 2006-12-18 17:46:13.000000000 +0000
+++ b/dlls/ddraw/ddraw_private.h 2007-01-04 13:03:43.000000000 +0000
@@ -631,7 +631,6 @@
} member_info;
/* Structure copy */
-#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1)
#define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) }
#define DD_STRUCT_COPY_BYSIZE(to,from) \
diff -urN a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c
--- a/dlls/ddraw/utils.c 2007-01-04 11:22:22.000000000 +0000
+++ b/dlls/ddraw/utils.c 2007-01-04 13:09:48.000000000 +0000
@@ -30,7 +30,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-void DDRAW_dump_flags_(DWORD flags, const flag_info* names, size_t num_names, int newline);
/*****************************************************************************
* PixelFormat_WineD3DtoDD
@@ -629,6 +628,25 @@
{
DPRINTF(" Low : %d - High : %d", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue);
}
+
+#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1)
+static void
+DDRAW_dump_flags_(DWORD flags,
+ const flag_info* names,
+ size_t num_names,
+ int newline)
+{
+ unsigned int i;
+
+ for (i=0; i < num_names; i++)
+ if ((flags & names[i].val) || /* standard flag value */
+ ((!flags) && (!names[i].val))) /* zero value only */
+ DPRINTF("%s ", names[i].name);
+
+ if (newline)
+ DPRINTF("\n");
+}
+
void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in)
{
static const flag_info flags[] = {
@@ -702,23 +720,6 @@
DDRAW_dump_DDSCAPS2(&in_bis);
}
-void
-DDRAW_dump_flags_(DWORD flags,
- const flag_info* names,
- size_t num_names,
- int newline)
-{
- unsigned int i;
-
- for (i=0; i < num_names; i++)
- if ((flags & names[i].val) || /* standard flag value */
- ((!flags) && (!names[i].val))) /* zero value only */
- DPRINTF("%s ", names[i].name);
-
- if (newline)
- DPRINTF("\n");
-}
-
static void
DDRAW_dump_pixelformat_flag(DWORD flagmask)
{
@@ -743,7 +744,7 @@
DDRAW_dump_flags_(flagmask, flags, sizeof(flags)/sizeof(flags[0]), 0);
}
-void
+static void
DDRAW_dump_members(DWORD flags,
const void* data,
const member_info* mems,
More information about the wine-patches
mailing list