--- cppuhelper/source/component_context.cxx 9 May 2007 13:25:10 -0000 1.30 +++ cppuhelper/source/component_context.cxx 5 Jun 2007 19:31:42 -0000 @@ -833,13 +833,13 @@ //################################################################################################## -extern "C" { static void s_createComponentContext_v(va_list param) +extern "C" { static void s_createComponentContext_v(va_list * pParam) { - ContextEntry_Init const * pEntries = va_arg(param, ContextEntry_Init const *); - sal_Int32 nEntries = va_arg(param, sal_Int32); - XComponentContext * pDelegatee = va_arg(param, XComponentContext *); - void ** ppContext = va_arg(param, void **); - uno::Mapping * pTarget2curr = va_arg(param, uno::Mapping *); + ContextEntry_Init const * pEntries = va_arg(*pParam, ContextEntry_Init const *); + sal_Int32 nEntries = va_arg(*pParam, sal_Int32); + XComponentContext * pDelegatee = va_arg(*pParam, XComponentContext *); + void ** ppContext = va_arg(*pParam, void **); + uno::Mapping * pTarget2curr = va_arg(*pParam, uno::Mapping *); Reference xDelegate(pDelegatee, SAL_NO_ACQUIRE); Reference xContext; --- cppuhelper/source/shlib.cxx 9 May 2007 13:26:03 -0000 1.27 +++ cppuhelper/source/shlib.cxx 5 Jun 2007 19:41:45 -0000 @@ -322,13 +322,13 @@ return aExcMsg; } -extern "C" {static void s_getFactory(va_list param) +extern "C" {static void s_getFactory(va_list * pParam) { - component_getFactoryFunc pSym = va_arg(param, component_getFactoryFunc); - OString const * pImplName = va_arg(param, OString const *); - void * pSMgr = va_arg(param, void *); - void * pKey = va_arg(param, void *); - void ** ppSSF = va_arg(param, void **); + component_getFactoryFunc pSym = va_arg(*pParam, component_getFactoryFunc); + OString const * pImplName = va_arg(*pParam, OString const *); + void * pSMgr = va_arg(*pParam, void *); + void * pKey = va_arg(*pParam, void *); + void ** ppSSF = va_arg(*pParam, void **); *ppSSF = pSym(pImplName->getStr(), pSMgr, pKey); }} @@ -469,12 +469,12 @@ } //============================================================================== -extern "C" { static void s_writeInfo(va_list param) +extern "C" { static void s_writeInfo(va_list * pParam) { - component_writeInfoFunc pSym = va_arg(param, component_writeInfoFunc); - void * pSMgr = va_arg(param, void *); - void * pKey = va_arg(param, void *); - sal_Bool * pbRet = va_arg(param, sal_Bool *); + component_writeInfoFunc pSym = va_arg(*pParam, component_writeInfoFunc); + void * pSMgr = va_arg(*pParam, void *); + void * pKey = va_arg(*pParam, void *); + sal_Bool * pbRet = va_arg(*pParam, sal_Bool *); *pbRet = pSym(pSMgr, pKey); --- cppuhelper/test/bootstrap/TestEnv.cxx 9 May 2007 13:26:30 -0000 1.2 +++ cppuhelper/test/bootstrap/TestEnv.cxx 5 Jun 2007 19:44:25 -0000 @@ -64,8 +64,8 @@ virtual void v_enter(void); virtual void v_leave(void); - virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list param); - virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list param); + virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam); + virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam); virtual int v_isValid (rtl::OUString * pReason); }; @@ -82,17 +82,17 @@ } -void TestEnv::v_callInto_v(uno_EnvCallee * pCallee, va_list param) +void TestEnv::v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) { ++ m_inCount; - pCallee(param); + pCallee(pParam); -- m_inCount; } -void TestEnv::v_callOut_v(uno_EnvCallee * pCallee, va_list param) +void TestEnv::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam) { -- m_inCount; - pCallee(param); + pCallee(pParam); ++ m_inCount; } --- bridges/source/cpp_uno/shared/component.cxx 9 May 2007 13:24:21 -0000 1.6 +++ bridges/source/cpp_uno/shared/component.cxx 5 Jun 2007 20:01:44 -0000 @@ -107,12 +107,12 @@ extern "C" { -static void s_stub_computeObjectIdentifier(va_list param) +static void s_stub_computeObjectIdentifier(va_list * pParam) SAL_THROW( () ) { - uno_ExtEnvironment * pEnv = va_arg(param, uno_ExtEnvironment *); - rtl_uString ** ppOId = va_arg(param, rtl_uString **); - void * pInterface = va_arg(param, void *); + uno_ExtEnvironment * pEnv = va_arg(*pParam, uno_ExtEnvironment *); + rtl_uString ** ppOId = va_arg(*pParam, rtl_uString **); + void * pInterface = va_arg(*pParam, void *); OSL_ENSURE( pEnv && ppOId && pInterface, "### null ptr!" ); @@ -168,11 +168,11 @@ uno_Environment_invoke(&pExtEnv->aBase, s_stub_computeObjectIdentifier, pExtEnv, ppOId, pInterface); } -static void s_stub_acquireInterface(va_list param) +static void s_stub_acquireInterface(va_list * pParam) SAL_THROW( () ) { - /*uno_ExtEnvironment * pExtEnv = */va_arg(param, uno_ExtEnvironment *); - void * pCppI = va_arg(param, void *); + /*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *); + void * pCppI = va_arg(*pParam, void *); reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->acquire(); } @@ -183,11 +183,11 @@ uno_Environment_invoke(&pExtEnv->aBase, s_stub_acquireInterface, pExtEnv, pCppI); } -static void s_stub_releaseInterface(va_list param) +static void s_stub_releaseInterface(va_list * pParam) SAL_THROW( () ) { - /*uno_ExtEnvironment * pExtEnv = */va_arg(param, uno_ExtEnvironment *); - void * pCppI = va_arg(param, void *); + /*uno_ExtEnvironment * pExtEnv = */va_arg(*pParam, uno_ExtEnvironment *); + void * pCppI = va_arg(*pParam, void *); reinterpret_cast< ::com::sun::star::uno::XInterface * >( pCppI )->release(); }