Nikolay Sivov : hlink: Remove useless initializers.
Alexandre Julliard
julliard at winehq.org
Tue Mar 26 15:11:11 CDT 2013
Module: wine
Branch: master
Commit: 3e3027761c3de5654ea015dbc9bbaf90ac3f6cc3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3027761c3de5654ea015dbc9bbaf90ac3f6cc3
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sat Mar 23 21:53:14 2013 +0400
hlink: Remove useless initializers.
---
dlls/hlink/browse_ctx.c | 2 +-
dlls/hlink/extserv.c | 2 +-
dlls/hlink/hlink_main.c | 15 ++++-----------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c
index 4e91398..0995493 100644
--- a/dlls/hlink/browse_ctx.c
+++ b/dlls/hlink/browse_ctx.c
@@ -116,7 +116,7 @@ static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* face,
static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface,
DWORD dwRegister)
{
- HRESULT r = S_OK;
+ HRESULT r;
IRunningObjectTable *ROT;
HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface);
diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c
index 670bac2..3a97fa9 100644
--- a/dlls/hlink/extserv.c
+++ b/dlls/hlink/extserv.c
@@ -235,7 +235,7 @@ static ULONG WINAPI ExtServ_Release(IExtensionServices *iface)
static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR pwzAdditionalHeaders)
{
- int len = 0;
+ int len;
heap_free(This->headers);
This->headers = NULL;
diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c
index 1890fd5..5adbe9d 100644
--- a/dlls/hlink/hlink_main.c
+++ b/dlls/hlink/hlink_main.c
@@ -75,7 +75,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation,
IUnknown* piunkOuter, REFIID riid, void** ppvObj)
{
IHlink *hl = NULL;
- HRESULT r = S_OK;
+ HRESULT r;
TRACE("%p %s %s %p %i %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation),
debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter,
@@ -107,7 +107,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
IUnknown* piunkOuter, REFIID riid, void** ppvObj)
{
IHlink *hl = NULL;
- HRESULT r = S_OK;
+ HRESULT r;
WCHAR *hash, *tgt;
const WCHAR *loc;
@@ -176,15 +176,8 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation,
*/
HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj)
{
- HRESULT r = S_OK;
-
TRACE("%p %s %p\n", piunkOuter, debugstr_guid(riid), ppvObj);
-
- r = CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj);
-
- TRACE("returning %i\n",r);
-
- return r;
+ return CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj);
}
/***********************************************************************
@@ -213,7 +206,7 @@ HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame,
IHlinkBrowseContext* phlbc, DWORD grfHLNF, IMoniker *pmkTarget,
LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG* puHLID)
{
- HRESULT r = S_OK;
+ HRESULT r;
TRACE("%p %p %i %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget,
debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID);
More information about the wine-cvs
mailing list