Constify NDR function tables

Dmitry Timoshkov dmitry at codeweavers.com
Fri Apr 14 07:38:41 CDT 2006


Hello,

Changelog:
    Constify NDR function tables.

diff -up cvs/hq/wine/dlls/rpcrt4/ndr_marshall.c wine/dlls/rpcrt4/ndr_marshall.c
--- cvs/hq/wine/dlls/rpcrt4/ndr_marshall.c	2006-03-04 17:20:34.000000000 +0800
+++ wine/dlls/rpcrt4/ndr_marshall.c	2006-04-14 15:20:50.000000000 +0900
@@ -112,7 +112,7 @@ static void WINAPI NdrBaseTypeBufferSize
 static void WINAPI NdrBaseTypeFree(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING);
 static unsigned long WINAPI NdrBaseTypeMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING);
 
-NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = {
+const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = {
   0,
   NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall,
   NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall,
@@ -149,7 +149,7 @@ NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZ
   0, 0, 0, 0,
   NdrUserMarshalMarshall
 };
-NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = {
+const NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = {
   0,
   NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall,
   NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall,
@@ -186,7 +186,7 @@ NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE
   0, 0, 0, 0,
   NdrUserMarshalUnmarshall
 };
-NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = {
+const NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = {
   0,
   NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize,
   NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize,
@@ -223,7 +223,7 @@ NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_
   0, 0, 0, 0,
   NdrUserMarshalBufferSize
 };
-NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_SIZE] = {
+const NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_SIZE] = {
   0,
   NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize,
   NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize,
@@ -253,7 +253,7 @@ NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_
   0, 0, 0, 0,
   NdrUserMarshalMemorySize
 };
-NDR_FREE NdrFreer[NDR_TABLE_SIZE] = {
+const NDR_FREE NdrFreer[NDR_TABLE_SIZE] = {
   0,
   NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree,
   NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree,
diff -up cvs/hq/wine/dlls/rpcrt4/ndr_misc.h wine/dlls/rpcrt4/ndr_misc.h
--- cvs/hq/wine/dlls/rpcrt4/ndr_misc.h	2006-01-13 12:07:26.000000000 +0800
+++ wine/dlls/rpcrt4/ndr_misc.h	2006-04-14 15:21:22.000000000 +0900
@@ -42,10 +42,10 @@ typedef void           (WINAPI *NDR_BUFF
 typedef unsigned long  (WINAPI *NDR_MEMORYSIZE)(PMIDL_STUB_MESSAGE,                 PFORMAT_STRING);
 typedef void           (WINAPI *NDR_FREE)      (PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING);
 
-extern NDR_MARSHALL   NdrMarshaller[];
-extern NDR_UNMARSHALL NdrUnmarshaller[];
-extern NDR_BUFFERSIZE NdrBufferSizer[];
-extern NDR_MEMORYSIZE NdrMemorySizer[];
-extern NDR_FREE       NdrFreer[];
+extern const NDR_MARSHALL   NdrMarshaller[];
+extern const NDR_UNMARSHALL NdrUnmarshaller[];
+extern const NDR_BUFFERSIZE NdrBufferSizer[];
+extern const NDR_MEMORYSIZE NdrMemorySizer[];
+extern const NDR_FREE       NdrFreer[];
 
 #endif  /* __WINE_NDR_MISC_H */





More information about the wine-patches mailing list