netapi32: Constify some variables (Try 2)

Andrew Talbot Andrew.Talbot at talbotville.com
Tue Jun 19 16:06:48 CDT 2007


Changelog:
    netapi32: Constify some variables.

diff -urN a/dlls/netapi32/access.c b/dlls/netapi32/access.c
--- a/dlls/netapi32/access.c	2007-05-15 20:16:29.000000000 +0100
+++ b/dlls/netapi32/access.c	2007-06-19 21:02:26.000000000 +0100
@@ -512,7 +512,7 @@
 /************************************************************
  * Copies NET_DISPLAY_USER record.
  */
-static void ACCESS_CopyDisplayUser(PNET_DISPLAY_USER dest, LPWSTR *dest_buf,
+static void ACCESS_CopyDisplayUser(const NET_DISPLAY_USER *dest, LPWSTR *dest_buf,
                             PNET_DISPLAY_USER src)
 {
     LPWSTR str = *dest_buf;
diff -urN a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c
--- a/dlls/netapi32/nbt.c	2007-03-12 13:30:36.000000000 +0000
+++ b/dlls/netapi32/nbt.c	2007-06-19 21:31:39.000000000 +0100
@@ -288,7 +288,7 @@
  * Returns NRC_GOODRET on timeout or a valid response received, something else
  * on error.
  */
-static UCHAR NetBTWaitForNameResponse(NetBTAdapter *adapter, SOCKET fd,
+static UCHAR NetBTWaitForNameResponse(const NetBTAdapter *adapter, SOCKET fd,
  DWORD waitUntil, NetBTAnswerCallback answerCallback, void *data)
 {
     BOOL found = FALSE;
@@ -424,7 +424,7 @@
          queryData->cacheEntry->numAddresses < answerCount)
         {
             queryData->cacheEntry->addresses[queryData->cacheEntry->
-             numAddresses++] = *(PDWORD)(rData + 2);
+             numAddresses++] = *(const DWORD *)(rData + 2);
             ret = queryData->cacheEntry->numAddresses < answerCount;
         }
         else
@@ -444,7 +444,7 @@
  * Returns NRC_GOODRET on success, though this may not mean the name was
  * resolved--check whether *cacheEntry is NULL.
  */
-static UCHAR NetBTNameWaitLoop(NetBTAdapter *adapter, SOCKET fd, PNCB ncb,
+static UCHAR NetBTNameWaitLoop(const NetBTAdapter *adapter, SOCKET fd, const NCB *ncb,
  DWORD sendTo, BOOL broadcast, DWORD timeout, DWORD maxQueries,
  NBNameCacheEntry **cacheEntry)
 {
@@ -1274,7 +1274,7 @@
     }
 }
 
-static UCHAR NetBTRegisterAdapter(PMIB_IPADDRROW ipRow)
+static UCHAR NetBTRegisterAdapter(const MIB_IPADDRROW *ipRow)
 {
     UCHAR ret;
     NetBTAdapter *adapter;
diff -urN a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c
--- a/dlls/netapi32/netbios.c	2007-03-12 13:30:36.000000000 +0000
+++ b/dlls/netapi32/netbios.c	2007-06-19 21:03:00.000000000 +0100
@@ -640,7 +640,7 @@
     return NRC_GOODRET;
 }
 
-static UCHAR nbHangup(NetBIOSAdapter *adapter, PNCB ncb)
+static UCHAR nbHangup(NetBIOSAdapter *adapter, const NCB *ncb)
 {
     UCHAR ret;
     NetBIOSSession *session;
@@ -661,7 +661,7 @@
     return ret;
 }
 
-void NetBIOSHangupSession(PNCB ncb)
+void NetBIOSHangupSession(const NCB *ncb)
 {
     NetBIOSAdapter *adapter;
 
diff -urN a/dlls/netapi32/netbios.h b/dlls/netapi32/netbios.h
--- a/dlls/netapi32/netbios.h	2006-05-23 13:48:21.000000000 +0100
+++ b/dlls/netapi32/netbios.h	2007-06-19 21:03:11.000000000 +0100
@@ -92,7 +92,7 @@
  * This function is intended for use by a transport, if the session is closed
  * by some error in the transport layer.
  */
-void NetBIOSHangupSession(PNCB ncb);
+void NetBIOSHangupSession(const NCB *ncb);
 
 /**
  * Functions a transport implementation must implement
@@ -132,7 +132,7 @@
  * some calls (recv) will block indefinitely, so a reset, shutdown, etc. will
  * never occur.
  */
-#define NCB_CANCELLED(pncb) *(PBOOL)((pncb)->ncb_reserve)
+#define NCB_CANCELLED(pncb) *(const BOOL *)((pncb)->ncb_reserve)
 
 typedef UCHAR (*NetBIOSAstat)(void *adapter, PNCB ncb);
 typedef UCHAR (*NetBIOSFindName)(void *adapter, PNCB ncb);
diff -urN a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c
--- a/dlls/netapi32/wksta.c	2007-05-15 20:16:29.000000000 +0100
+++ b/dlls/netapi32/wksta.c	2007-06-19 21:55:56.000000000 +0100
@@ -71,7 +71,7 @@
     }
 }
 
-static void wprint_mac(WCHAR* buffer, int len, PMIB_IFROW ifRow)
+static void wprint_mac(WCHAR* buffer, int len, const MIB_IFROW *ifRow)
 {
     int i;
     unsigned char val;



More information about the wine-patches mailing list