From fd1c983af4409fd4dbceb03609f366b48a92db0b Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 10 Oct 2007 22:39:44 +0000 Subject: [PATCH] ----------------------------------------------------- autocomplete.c: Andrew Talbot Exclude unused headers Constify some variables. ----------------------------------------------------- dde.c: Jonathan Ernst Update the address of the Free Software Foundation. ----------------------------------------------------- dragdrophelper.c: Jonathan Ernst Update the address of the Free Software Foundation. Hans Leidekker Win64 printf format warning fixes. ----------------------------------------------------- enumidlist.c: Jonathan Ernst Update the address of the Free Software Foundation. Hans Leidekker Win64 printf format warning fixes. ----------------------------------------------------- enumidlist.h: Jonathan Ernst Update the address of the Free Software Foundation. ----------------------------------------------------- shellreg.c: Andrew Talbot Exclude unused headers. Detlef Riekenberg Implement SHRegQueryValueA with RegQueryValueA. Jonathan Ernst Update the address of the Free Software Foundation. ----------------------------------------------------- shellstring.c: Jonathan Ernst Update the address of the Free Software Foundation. Hans Leidekker Win64 printf format warning fixes. Andrew Talbot Exclude unused headers. ----------------------------------------------------- shlfsbind.c Jonathan Ernst Update the address of the Free Software Foundation. Hans Leidekker shell32: Win64 printf format warning fixes. Andrew Talbot shell32: Exclude unused headers. ----------------------------------------------------- shlmenu.c: Dmitry Timoshkov Switch to using 'long' for INT_PTR type for 64-bit compatibility. Andrew Talbot Exclude unused headers. Hans Leidekker Win64 printf format warning fixes. James Hawkins janitorial: Remove redundant NULL checks before SHFree. Francois Gouget Fix spelling of a local variable. Jonathan Ernst Update the address of the Free Software Foundation. ----------------------------------------------------- shpolicy.c: Dmitry Timoshkov Make some data static and const. Jonathan Ernst Update the address of the Free Software Foundation. svn path=/trunk/; revision=29485 --- reactos/dll/win32/shell32/changenotify.c | 3 +- reactos/dll/win32/shell32/dde.c | 2 +- reactos/dll/win32/shell32/dragdrophelper.c | 12 +++---- reactos/dll/win32/shell32/enumidlist.c | 12 +++---- reactos/dll/win32/shell32/enumidlist.h | 2 +- reactos/dll/win32/shell32/shellreg.c | 14 ++++++-- reactos/dll/win32/shell32/shellstring.c | 12 +++---- reactos/dll/win32/shell32/shlfsbind.c | 7 ++-- reactos/dll/win32/shell32/shlmenu.c | 38 +++++++++------------- reactos/dll/win32/shell32/shpolicy.c | 6 ++-- 10 files changed, 53 insertions(+), 55 deletions(-) diff --git a/reactos/dll/win32/shell32/changenotify.c b/reactos/dll/win32/shell32/changenotify.c index c5afc218a9a..b3cf051734d 100644 --- a/reactos/dll/win32/shell32/changenotify.c +++ b/reactos/dll/win32/shell32/changenotify.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -#include "wingdi.h" #include "shell32_main.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -106,7 +105,7 @@ static const char * DumpEvent( LONG event ) #undef DUMPEV } -static const char * NodeName(LPNOTIFICATIONLIST item) +static const char * NodeName(const NOTIFICATIONLIST *item) { const char *str; WCHAR path[MAX_PATH]; diff --git a/reactos/dll/win32/shell32/dde.c b/reactos/dll/win32/shell32/dde.c index 21ddfccb7a1..ea794ad7f09 100644 --- a/reactos/dll/win32/shell32/dde.c +++ b/reactos/dll/win32/shell32/dde.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include diff --git a/reactos/dll/win32/shell32/dragdrophelper.c b/reactos/dll/win32/shell32/dragdrophelper.c index bd58da09dca..9c3f236f061 100644 --- a/reactos/dll/win32/shell32/dragdrophelper.c +++ b/reactos/dll/win32/shell32/dragdrophelper.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" @@ -115,7 +115,7 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE ("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -125,7 +125,7 @@ static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface) IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE ("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) { TRACE("-- destroying (%p)\n", This); @@ -143,7 +143,7 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter ( DWORD dwEffect) { IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; - FIXME ("(%p)->(%p %p %p 0x%08lx)\n", This,hwndTarget, pDataObject, ppt, dwEffect); + FIXME ("(%p)->(%p %p %p 0x%08x)\n", This,hwndTarget, pDataObject, ppt, dwEffect); return E_NOTIMPL; } @@ -157,14 +157,14 @@ static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface) static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect) { IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; - FIXME ("(%p)->(%p 0x%08lx)\n", This, ppt, dwEffect); + FIXME ("(%p)->(%p 0x%08x)\n", This, ppt, dwEffect); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) { IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; - FIXME ("(%p)->(%p %p 0x%08lx)\n", This, pDataObject, ppt, dwEffect); + FIXME ("(%p)->(%p %p 0x%08x)\n", This, pDataObject, ppt, dwEffect); return E_NOTIMPL; } diff --git a/reactos/dll/win32/shell32/enumidlist.c b/reactos/dll/win32/shell32/enumidlist.c index 98577f22e43..6356c4d68bc 100644 --- a/reactos/dll/win32/shell32/enumidlist.c +++ b/reactos/dll/win32/shell32/enumidlist.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include @@ -116,7 +116,7 @@ BOOL CreateFolderEnumList( static const WCHAR dot[] = { '.',0 }; static const WCHAR dotdot[] = { '.','.',0 }; - TRACE("(%p)->(path=%s flags=0x%08lx)\n", list, debugstr_w(lpszPath), dwFlags); + TRACE("(%p)->(path=%s flags=0x%08x)\n", list, debugstr_w(lpszPath), dwFlags); if(!lpszPath || !lpszPath[0]) return FALSE; @@ -246,7 +246,7 @@ static ULONG WINAPI IEnumIDList_fnAddRef( IEnumIDListImpl *This = (IEnumIDListImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount - 1); + TRACE("(%p)->(%u)\n", This, refCount - 1); return refCount; } @@ -259,7 +259,7 @@ static ULONG WINAPI IEnumIDList_fnRelease( IEnumIDListImpl *This = (IEnumIDListImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount + 1); + TRACE("(%p)->(%u)\n", This, refCount + 1); if (!refCount) { TRACE(" destroying IEnumIDList(%p)\n",This); @@ -285,7 +285,7 @@ static HRESULT WINAPI IEnumIDList_fnNext( HRESULT hr = S_OK; LPITEMIDLIST temp; - TRACE("(%p)->(%ld,%p, %p)\n",This,celt,rgelt,pceltFetched); + TRACE("(%p)->(%d,%p, %p)\n",This,celt,rgelt,pceltFetched); /* It is valid to leave pceltFetched NULL when celt is 1. Some of explorer's * subsystems actually use it (and so may a third party browser) @@ -329,7 +329,7 @@ static HRESULT WINAPI IEnumIDList_fnSkip( DWORD dwIndex; HRESULT hr = S_OK; - TRACE("(%p)->(%lu)\n",This,celt); + TRACE("(%p)->(%u)\n",This,celt); for(dwIndex = 0; dwIndex < celt; dwIndex++) { if(!This->mpCurrent) diff --git a/reactos/dll/win32/shell32/enumidlist.h b/reactos/dll/win32/shell32/enumidlist.h index 26972aa191a..000b32bc19d 100644 --- a/reactos/dll/win32/shell32/enumidlist.h +++ b/reactos/dll/win32/shell32/enumidlist.h @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __ENUMIDLIST_H__ #define __ENUMIDLIST_H__ diff --git a/reactos/dll/win32/shell32/shellreg.c b/reactos/dll/win32/shell32/shellreg.c index a34f00fe6ee..9ed8f9a6c07 100644 --- a/reactos/dll/win32/shell32/shellreg.c +++ b/reactos/dll/win32/shell32/shellreg.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" @@ -30,9 +30,7 @@ #include "wingdi.h" #include "winuser.h" #include "shlobj.h" -#include "winerror.h" #include "winreg.h" -#include "winnls.h" #include "undocshell.h" #include "wine/winbase16.h" @@ -67,6 +65,16 @@ HRESULT WINAPI SHRegOpenKeyW ( return RegOpenKeyW( hkey, lpszSubKey, retkey ); } +/************************************************************************* + * SHRegQueryValueA [SHELL32.508] + * + */ +HRESULT WINAPI SHRegQueryValueA(HKEY hkey, LPSTR lpSubKey, LPSTR lpValue, LPDWORD lpcbValue) +{ + TRACE("(%p %s %p %p)\n", hkey, debugstr_a(lpSubKey), lpValue, lpcbValue); + return RegQueryValueA(hkey, lpSubKey, lpValue, (LONG*)lpcbValue); +} + /************************************************************************* * SHRegQueryValueExA [SHELL32.509] * diff --git a/reactos/dll/win32/shell32/shellstring.c b/reactos/dll/win32/shell32/shellstring.c index a41b0b94636..a35e15cd96c 100644 --- a/reactos/dll/win32/shell32/shellstring.c +++ b/reactos/dll/win32/shell32/shellstring.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include @@ -27,13 +27,11 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "winerror.h" #include "wingdi.h" #include "winuser.h" #include "winreg.h" #include "shlobj.h" -#include "shellapi.h" #include "shlwapi.h" #include "shell32_main.h" #include "undocshell.h" @@ -46,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { - TRACE("dest=%p len=0x%lx strret=%p(%s) pidl=%p\n", + TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest,len,src, (src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" : @@ -84,7 +82,7 @@ BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST BOOL WINAPI StrRetToStrNW(LPWSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { - TRACE("dest=%p len=0x%lx strret=%p(%s) pidl=%p\n", + TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest,len,src, (src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" : @@ -243,7 +241,7 @@ DWORD WINAPI CheckEscapesA( LPWSTR wString; DWORD ret = 0; - TRACE("(%s %ld)\n", debugstr_a(string), len); + TRACE("(%s %d)\n", debugstr_a(string), len); wString = (LPWSTR)LocalAlloc(LPTR, len * sizeof(WCHAR)); if (wString) { @@ -269,7 +267,7 @@ DWORD WINAPI CheckEscapesW( DWORD size = lstrlenW(string); LPWSTR s, d; - TRACE("(%s %ld) stub\n", debugstr_w(string), len); + TRACE("(%s %d) stub\n", debugstr_w(string), len); if (StrPBrkW(string, strEscapedChars) && size + 2 <= len) { diff --git a/reactos/dll/win32/shell32/shlfsbind.c b/reactos/dll/win32/shell32/shlfsbind.c index e2bbfcce6c7..c50e74c3a95 100644 --- a/reactos/dll/win32/shell32/shlfsbind.c +++ b/reactos/dll/win32/shell32/shlfsbind.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ #include "config.h" @@ -28,7 +28,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winuser.h" #include "shlobj.h" #include "shell32_main.h" @@ -179,7 +178,7 @@ static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface) IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount - 1); + TRACE("(%p)->(count=%i)\n", This, refCount - 1); return refCount; } @@ -189,7 +188,7 @@ static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface) IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount + 1); + TRACE("(%p)->(count=%i)\n", This, refCount + 1); if (!refCount) { diff --git a/reactos/dll/win32/shell32/shlmenu.c b/reactos/dll/win32/shell32/shlmenu.c index 1a451008f92..cdd08c9fcc4 100644 --- a/reactos/dll/win32/shell32/shlmenu.c +++ b/reactos/dll/win32/shell32/shlmenu.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include @@ -32,7 +32,6 @@ #include "undocshell.h" #include "shlwapi.h" #include "shell32_main.h" -#include "shlguid.h" #include "pidl.h" #include "wine/debug.h" @@ -90,7 +89,7 @@ static LPFMINFO FM_GetMenuInfo(HMENU hmenu) if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize); + ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); return 0; } @@ -115,9 +114,7 @@ static LPFMINFO FM_SetMenuParameter( menudata = FM_GetMenuInfo(hmenu); - if ( menudata->pidl) - { SHFree(menudata->pidl); - } + SHFree(menudata->pidl); menudata->uID = uID; menudata->pidl = ILClone(pidl); @@ -155,7 +152,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize); + ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); return 0; } @@ -267,7 +264,7 @@ HMENU WINAPI FileMenu_Create ( HMENU hMenu = CreatePopupMenu(); - TRACE("0x%08lx 0x%08x %p 0x%08x 0x%08x hMenu=%p\n", + TRACE("0x%08x 0x%08x %p 0x%08x 0x%08x hMenu=%p\n", crBorderColor, nBorderWidth, hBorderBmp, nSelHeight, uFlags, hMenu); menudata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO)); @@ -299,9 +296,7 @@ void WINAPI FileMenu_Destroy (HMENU hmenu) menudata = FM_GetMenuInfo(hmenu); - if ( menudata->pidl) - { SHFree( menudata->pidl); - } + SHFree( menudata->pidl); HeapFree(GetProcessHeap(), 0, menudata); DestroyMenu (hmenu); @@ -375,7 +370,7 @@ static BOOL FileMenu_AppendItemW( menudata = (LPFMINFO)MenuInfo.dwMenuData; if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize); + ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); return 0; } @@ -485,7 +480,7 @@ HMENU WINAPI FileMenu_FindSubMenuByPidl( int WINAPI FileMenu_AppendFilesForPidl( HMENU hmenu, LPCITEMIDLIST pidl, - BOOL bAddSeperator) + BOOL bAddSeparator) { LPFMINFO menudata; @@ -495,10 +490,10 @@ int WINAPI FileMenu_AppendFilesForPidl( FM_InitMenuPopup(hmenu, pidl); - if (bAddSeperator) + if (bAddSeparator) FileMenu_AppendItemW (hmenu, FM_SEPARATOR, 0, 0, 0, FM_DEFAULT_HEIGHT); - TRACE("%p %p 0x%08x\n",hmenu, pidl,bAddSeperator); + TRACE("%p %p 0x%08x\n",hmenu, pidl,bAddSeparator); return 0; } @@ -637,7 +632,7 @@ LRESULT WINAPI FileMenu_DrawItem( Shell_GetImageList(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); - TRACE("-- 0x%04lx 0x%04lx 0x%04lx 0x%04lx\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); + TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); SetTextColor(lpdis->hDC, clrPrevText); SetBkColor(lpdis->hDC, clrPrevBkgnd); @@ -666,7 +661,7 @@ LRESULT WINAPI FileMenu_HandleMenuChar( HMENU hMenu, WPARAM wParam) { - FIXME("%p 0x%08x\n",hMenu,wParam); + FIXME("%p 0x%08lx\n",hMenu,wParam); return 0; } @@ -692,8 +687,7 @@ BOOL WINAPI FileMenu_DeleteAllItems (HMENU hmenu) for (i = 0; i < GetMenuItemCount( hmenu ); i++) { GetMenuItemInfoW(hmenu, i, TRUE, &mii ); - if (mii.dwItemData) - SHFree((LPFMINFO)mii.dwItemData); + SHFree((LPFMINFO)mii.dwItemData); if (mii.hSubMenu) FileMenu_Destroy(mii.hSubMenu); @@ -799,7 +793,7 @@ DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos) FIXME("%p 0x%08x\n", hMenu, uPos); if (GetMenuItemRect(0, hMenu, uPos, &rect)) - { FIXME("0x%04lx 0x%04lx 0x%04lx 0x%04lx\n", + { FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n", rect.right, rect.left, rect.top, rect.bottom); return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom); } @@ -833,7 +827,7 @@ void WINAPI FileMenu_AbortInitMenu (void) */ LPVOID WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x) { - FIXME("hmenu=%p hwnd=%p 0x%08lx 0x%08lx stub\n", + FIXME("hmenu=%p hwnd=%p 0x%08x 0x%08x stub\n", hMenu,hWndParent,w,x); return NULL; /* this is supposed to be a pointer */ } @@ -872,7 +866,7 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI WCHAR szName[256]; UINT uTemp, uIDMax = uIDAdjust; - TRACE("hmenu1=%p hmenu2=%p 0x%04x 0x%04x 0x%04x 0x%04lx\n", + TRACE("hmenu1=%p hmenu2=%p 0x%04x 0x%04x 0x%04x 0x%04x\n", hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags); if (!hmDst || !hmSrc) diff --git a/reactos/dll/win32/shell32/shpolicy.c b/reactos/dll/win32/shell32/shpolicy.c index 8e435425780..8441a7492a2 100644 --- a/reactos/dll/win32/shell32/shpolicy.c +++ b/reactos/dll/win32/shell32/shpolicy.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * NOTES: * @@ -133,7 +133,7 @@ static const char strNoClose[] = {"NoClose"}; static const char strNoRun[] = {"NoRun"}; /* policy data array */ -POLICYDATA sh32_policy_table[] = +static POLICYDATA sh32_policy_table[] = { { REST_NORUN, @@ -796,7 +796,7 @@ POLICYDATA sh32_policy_table[] = 0, 0, SHELL_NO_POLICY - } + } }; /*************************************************************************