Alexandre Julliard : advapi32: Make some variables static and/or const.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 7bbc1d68c596be402c9ec74da79838cc5cb0c973
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=7bbc1d68c596be402c9ec74d...

Author: Alexandre Julliard 
Date:   Mon Jun 12 13:41:15 2006 +0200

advapi32: Make some variables static and/or const.

---

dlls/advapi32/crypt.c    |    2 +-
 dlls/advapi32/security.c |   12 ++++++------
 dlls/advapi32/service.c  |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index e6c3988..893bdc9 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -50,7 +50,7 @@ #include "winternl.h"

WINE_DEFAULT_DEBUG_CHANNEL(crypt);

-HWND crypt_hWindow = 0;
+static HWND crypt_hWindow;

#define CRYPT_ReturnLastError(err) do {SetLastError(err); return FALSE;} while(0)

diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 03a8eaa..2630606 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -2567,7 +2567,7 @@ static DWORD ParseAclStringFlags(LPCWSTR
 /******************************************************************************
  * ParseAceStringType
  */
-ACEFLAG AceType[] =
+static const ACEFLAG AceType[] =
 {
     { SDDL_ACCESS_ALLOWED, ACCESS_ALLOWED_ACE_TYPE },
     { SDDL_ALARM,          SYSTEM_ALARM_ACE_TYPE },
@@ -2586,7 +2586,7 @@ static BYTE ParseAceStringType(LPCWSTR* 
 {
     UINT len = 0;
     LPCWSTR szAcl = *StringAcl;
-    LPACEFLAG lpaf = AceType;
+    const ACEFLAG *lpaf = AceType;

while (lpaf->wstr &&
         (len = strlenW(lpaf->wstr)) &&
@@ -2604,7 +2604,7 @@ static BYTE ParseAceStringType(LPCWSTR* 
 /******************************************************************************
  * ParseAceStringFlags
  */
-ACEFLAG AceFlags[] =
+static const ACEFLAG AceFlags[] =
 {
     { SDDL_CONTAINER_INHERIT, CONTAINER_INHERIT_ACE },
     { SDDL_AUDIT_FAILURE,     FAILED_ACCESS_ACE_FLAG },
@@ -2624,7 +2624,7 @@ static BYTE ParseAceStringFlags(LPCWSTR*

while (*szAcl != ';')
     {
-        LPACEFLAG lpaf = AceFlags;
+        const ACEFLAG *lpaf = AceFlags;

while (lpaf->wstr &&
                (len = strlenW(lpaf->wstr)) &&
@@ -2646,7 +2646,7 @@ static BYTE ParseAceStringFlags(LPCWSTR*
 /******************************************************************************
  * ParseAceStringRights
  */
-ACEFLAG AceRights[] =
+static const ACEFLAG AceRights[] =
 {
     { SDDL_GENERIC_ALL,     GENERIC_ALL },
     { SDDL_GENERIC_READ,    GENERIC_READ },
@@ -2684,7 +2684,7 @@ static DWORD ParseAceStringRights(LPCWST
     {
         while (*szAcl != ';')
         {
-            LPACEFLAG lpaf = AceRights;
+            const ACEFLAG *lpaf = AceRights;

while (lpaf->wstr &&
                (len = strlenW(lpaf->wstr)) &&
diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index b7863c7..cd12416 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -79,7 +79,7 @@ static CRITICAL_SECTION_DEBUG service_cs
 };
 static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 };

-service_data *service_list;
+static service_data *service_list;

/******************************************************************************
  * SC_HANDLEs