mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 773637 - Kill NS_SCRIPTABLE annotations, Part 1: Remove NS_*PARAM annotations. r=ehsan 

--HG--
extra : rebase_source : a0b4bc50fece36d9a90fed61431635948bfa33b5
This commit is contained in:
Joshua Cranmer 2012-07-06 15:14:07 -05:00
Родитель d539846cab
Коммит a1186c1020
93 изменённых файлов: 207 добавлений и 620 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
browser/components/migration/src/nsIEHistoryEnumerator.cpp
Просмотреть файл

@ -73,7 +73,7 @@ nsIEHistoryEnumerator::EnsureInitialized()
}
NS_IMETHODIMP
nsIEHistoryEnumerator::HasMoreElements(bool* _retval NS_OUTPARAM)
nsIEHistoryEnumerator::HasMoreElements(bool* _retval)
{
*_retval = false;
@ -124,7 +124,7 @@ nsIEHistoryEnumerator::HasMoreElements(bool* _retval NS_OUTPARAM)
}
NS_IMETHODIMP
nsIEHistoryEnumerator::GetNext(nsISupports** _retval NS_OUTPARAM)
nsIEHistoryEnumerator::GetNext(nsISupports** _retval)
{
*_retval = nsnull;

24
caps/include/nsPrincipal.h
Просмотреть файл

@ -29,12 +29,12 @@ protected:
public:
NS_IMETHOD_(nsrefcnt) AddRef(void);
NS_IMETHOD_(nsrefcnt) Release(void);
NS_SCRIPTABLE NS_IMETHOD GetPreferences(char** prefBranch NS_OUTPARAM, char** id NS_OUTPARAM, char** subjectName NS_OUTPARAM, char** grantedList NS_OUTPARAM, char** deniedList NS_OUTPARAM, bool* isTrusted NS_OUTPARAM);
NS_SCRIPTABLE NS_IMETHOD GetPreferences(char** prefBranch, char** id, char** subjectName, char** grantedList, char** deniedList, bool* isTrusted);
NS_IMETHOD GetSecurityPolicy(void** aSecurityPolicy);
NS_IMETHOD SetSecurityPolicy(void* aSecurityPolicy);
NS_IMETHOD CanEnableCapability(const char* capability, PRInt16* _retval NS_OUTPARAM);
NS_IMETHOD IsCapabilityEnabled(const char* capability, void* annotation, bool* _retval NS_OUTPARAM);
NS_IMETHOD EnableCapability(const char* capability, void** annotation NS_INOUTPARAM);
NS_IMETHOD CanEnableCapability(const char* capability, PRInt16* _retval);
NS_IMETHOD IsCapabilityEnabled(const char* capability, void* annotation, bool* _retval);
NS_IMETHOD EnableCapability(const char* capability, void** annotation);
NS_IMETHOD GetHasCertificate(bool* aHasCertificate);
NS_IMETHOD GetFingerprint(nsACString& aFingerprint);
NS_IMETHOD GetPrettyName(nsACString& aPrettyName);
@ -114,15 +114,15 @@ class nsPrincipal : public nsBasePrincipal
public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSISERIALIZABLE
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval NS_OUTPARAM);
NS_IMETHOD EqualsIgnoringDomain(nsIPrincipal* other, bool* _retval NS_OUTPARAM);
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval);
NS_IMETHOD EqualsIgnoringDomain(nsIPrincipal* other, bool* _retval);
NS_IMETHOD GetHashValue(PRUint32* aHashValue);
NS_IMETHOD GetURI(nsIURI** aURI);
NS_IMETHOD GetDomain(nsIURI** aDomain);
NS_IMETHOD SetDomain(nsIURI* aDomain);
NS_IMETHOD GetOrigin(char** aOrigin);
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval NS_OUTPARAM);
NS_IMETHOD SubsumesIgnoringDomain(nsIPrincipal* other, bool* _retval NS_OUTPARAM);
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval);
NS_IMETHOD SubsumesIgnoringDomain(nsIPrincipal* other, bool* _retval);
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report);
NS_IMETHOD GetExtendedOrigin(nsACString& aExtendedOrigin);
NS_IMETHOD GetAppStatus(PRUint16* aAppStatus);
@ -192,15 +192,15 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIEXPANDEDPRINCIPAL
NS_DECL_NSISERIALIZABLE
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval NS_OUTPARAM);
NS_IMETHOD EqualsIgnoringDomain(nsIPrincipal* other, bool* _retval NS_OUTPARAM);
NS_IMETHOD Equals(nsIPrincipal* other, bool* _retval);
NS_IMETHOD EqualsIgnoringDomain(nsIPrincipal* other, bool* _retval);
NS_IMETHOD GetHashValue(PRUint32* aHashValue);
NS_IMETHOD GetURI(nsIURI** aURI);
NS_IMETHOD GetDomain(nsIURI** aDomain);
NS_IMETHOD SetDomain(nsIURI* aDomain);
NS_IMETHOD GetOrigin(char** aOrigin);
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval NS_OUTPARAM);
NS_IMETHOD SubsumesIgnoringDomain(nsIPrincipal* other, bool* _retval NS_OUTPARAM);
NS_IMETHOD Subsumes(nsIPrincipal* other, bool* _retval);
NS_IMETHOD SubsumesIgnoringDomain(nsIPrincipal* other, bool* _retval);
NS_IMETHOD CheckMayLoad(nsIURI* uri, bool report);
NS_IMETHOD GetExtendedOrigin(nsACString& aExtendedOrigin);
NS_IMETHOD GetAppStatus(PRUint16* aAppStatus);

4
chrome/src/nsChromeRegistry.h
Просмотреть файл

@ -57,9 +57,9 @@ public:
NS_IMETHOD ReloadChrome();
NS_IMETHOD RefreshSkins();
NS_IMETHOD AllowScriptsForPackage(nsIURI* url,
bool* _retval NS_OUTPARAM);
bool* _retval);
NS_IMETHOD AllowContentToAccess(nsIURI* url,
bool* _retval NS_OUTPARAM);
bool* _retval);
// nsIChromeRegistry methods:
NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI);

2
content/base/src/nsGenericElement.h
Просмотреть файл

@ -462,7 +462,7 @@ public:
* Helper methods for implementing querySelector/querySelectorAll
*/
static nsIContent* doQuerySelector(nsINode* aRoot, const nsAString& aSelector,
nsresult *aResult NS_OUTPARAM);
nsresult *aResult);
static nsresult doQuerySelectorAll(nsINode* aRoot,
const nsAString& aSelector,
nsIDOMNodeList **aReturn);

4
content/events/src/nsDOMEventTargetHelper.h
Просмотреть файл

@ -212,7 +212,7 @@ private:
NS_IMETHOD RemoveSystemEventListener(const nsAString & type, nsIDOMEventListener *listener, bool aUseCapture) { \
return _to RemoveSystemEventListener(type, listener, aUseCapture); \
} \
NS_SCRIPTABLE NS_IMETHOD DispatchEvent(nsIDOMEvent *evt, bool *_retval NS_OUTPARAM) { \
NS_SCRIPTABLE NS_IMETHOD DispatchEvent(nsIDOMEvent *evt, bool *_retval) { \
return _to DispatchEvent(evt, _retval); \
} \
virtual nsIDOMEventTarget * GetTargetForDOMEvent(void) { \
@ -233,7 +233,7 @@ private:
virtual nsEventListenerManager * GetListenerManager(bool aMayCreate) { \
return _to GetListenerManager(aMayCreate); \
} \
virtual nsIScriptContext * GetContextForEventHandlers(nsresult *aRv NS_OUTPARAM) { \
virtual nsIScriptContext * GetContextForEventHandlers(nsresult *aRv) { \
return _to GetContextForEventHandlers(aRv); \
} \
virtual JSContext * GetJSContextForEventHandlers(void) { \

2
content/html/content/src/nsDOMStringMap.cpp
Просмотреть файл

@ -89,7 +89,7 @@ NS_IMETHODIMP_(bool) nsDOMStringMap::HasDataAttr(const nsAString& aProp)
/* [noscript] DOMString getDataAttr (in DOMString prop); */
NS_IMETHODIMP nsDOMStringMap::GetDataAttr(const nsAString& aProp,
nsAString& aResult NS_OUTPARAM)
nsAString& aResult)
{
nsAutoString attr;

6
content/html/content/src/nsHTMLSelectElement.h
Просмотреть файл

@ -308,7 +308,7 @@ public:
* @return whether the option is disabled
*/
NS_IMETHOD IsOptionDisabled(PRInt32 aIndex,
bool *aIsDisabled NS_OUTPARAM);
bool *aIsDisabled);
/**
* Sets multiple options (or just sets startIndex if select is single)
@ -333,7 +333,7 @@ public:
bool aClearAll,
bool aSetDisabled,
bool aNotify,
bool* aChangedSomething NS_OUTPARAM);
bool* aChangedSomething);
/**
* Finds the index of a given option element
@ -346,7 +346,7 @@ public:
NS_IMETHOD GetOptionIndex(nsIDOMHTMLOptionElement* aOption,
PRInt32 aStartIndex,
bool aForward,
PRInt32* aIndex NS_OUTPARAM);
PRInt32* aIndex);
/**
* Called when an attribute is about to be changed

2
dom/base/nsDOMWindowUtils.cpp
Просмотреть файл

@ -1930,7 +1930,7 @@ nsDOMWindowUtils::StartFrameTimeRecording()
}
NS_IMETHODIMP
nsDOMWindowUtils::StopFrameTimeRecording(PRUint32 *frameCount NS_OUTPARAM, float **frames NS_OUTPARAM)
nsDOMWindowUtils::StopFrameTimeRecording(PRUint32 *frameCount, float **frames)
{
NS_ENSURE_ARG_POINTER(frameCount);
NS_ENSURE_ARG_POINTER(frames);

2
dom/base/nsGlobalWindowCommands.cpp
Просмотреть файл

@ -94,7 +94,7 @@ public:
virtual ~nsSelectionCommandsBase() {}
NS_DECL_ISUPPORTS
NS_IMETHOD IsCommandEnabled(const char * aCommandName, nsISupports *aCommandContext, bool *_retval NS_OUTPARAM);
NS_IMETHOD IsCommandEnabled(const char * aCommandName, nsISupports *aCommandContext, bool *_retval);
NS_IMETHOD GetCommandStateParams(const char * aCommandName, nsICommandParams *aParams, nsISupports *aCommandContext);
NS_IMETHOD DoCommandParams(const char * aCommandName, nsICommandParams *aParams, nsISupports *aCommandContext);

12
dom/devicestorage/nsDeviceStorage.cpp
Просмотреть файл

@ -1230,7 +1230,7 @@ nsDOMDeviceStorage::GetType(nsAString & aType)
}
NS_IMETHODIMP
nsDOMDeviceStorage::Add(nsIDOMBlob *aBlob, nsIDOMDOMRequest * *_retval NS_OUTPARAM)
nsDOMDeviceStorage::Add(nsIDOMBlob *aBlob, nsIDOMDOMRequest * *_retval)
{
// possible race here w/ unique filename
char buffer[128];
@ -1245,7 +1245,7 @@ nsDOMDeviceStorage::Add(nsIDOMBlob *aBlob, nsIDOMDOMRequest * *_retval NS_OUTPAR
NS_IMETHODIMP
nsDOMDeviceStorage::AddNamed(nsIDOMBlob *aBlob,
const nsAString & aPath,
nsIDOMDOMRequest * *_retval NS_OUTPARAM)
nsIDOMDOMRequest * *_retval)
{
// if the blob is null here, bail
if (aBlob == nsnull)
@ -1277,7 +1277,7 @@ nsDOMDeviceStorage::AddNamed(nsIDOMBlob *aBlob,
NS_IMETHODIMP
nsDOMDeviceStorage::Get(const JS::Value & aPath,
JSContext* aCx,
nsIDOMDOMRequest * *_retval NS_OUTPARAM)
nsIDOMDOMRequest * *_retval)
{
return GetInternal(aPath, aCx, _retval, false);
}
@ -1285,7 +1285,7 @@ nsDOMDeviceStorage::Get(const JS::Value & aPath,
NS_IMETHODIMP
nsDOMDeviceStorage::GetEditable(const JS::Value & aPath,
JSContext* aCx,
nsIDOMDOMRequest * *_retval NS_OUTPARAM)
nsIDOMDOMRequest * *_retval)
{
return GetInternal(aPath, aCx, _retval, true);
}
@ -1293,7 +1293,7 @@ nsDOMDeviceStorage::GetEditable(const JS::Value & aPath,
nsresult
nsDOMDeviceStorage::GetInternal(const JS::Value & aPath,
JSContext* aCx,
nsIDOMDOMRequest * *_retval NS_OUTPARAM,
nsIDOMDOMRequest * *_retval,
bool aEditable)
{
nsCOMPtr<nsPIDOMWindow> win = do_QueryReferent(mOwner);
@ -1331,7 +1331,7 @@ nsDOMDeviceStorage::GetInternal(const JS::Value & aPath,
}
NS_IMETHODIMP
nsDOMDeviceStorage::Delete(const JS::Value & aPath, JSContext* aCx, nsIDOMDOMRequest * *_retval NS_OUTPARAM)
nsDOMDeviceStorage::Delete(const JS::Value & aPath, JSContext* aCx, nsIDOMDOMRequest * *_retval)
{
nsCOMPtr<nsIRunnable> r;

2
dom/devicestorage/nsDeviceStorage.h
Просмотреть файл

@ -83,7 +83,7 @@ public:
private:
~nsDOMDeviceStorage();
nsresult GetInternal(const JS::Value & aName, JSContext* aCx, nsIDOMDOMRequest * *_retval NS_OUTPARAM, bool aEditable);
nsresult GetInternal(const JS::Value & aName, JSContext* aCx, nsIDOMDOMRequest * *_retval, bool aEditable);
nsresult EnumerateInternal(const JS::Value & aName, const JS::Value & aOptions, JSContext* aCx, PRUint8 aArgc, bool aEditable, nsIDOMDeviceStorageCursor** aRetval);

2
dom/interfaces/events/nsIDOMEvent.idl
Просмотреть файл

@ -200,7 +200,7 @@ NS_NewDOMKeyboardEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresCon
nsresult
NS_NewDOMCompositionEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, class nsCompositionEvent *aEvent);
nsresult
NS_NewDOMMutationEvent(nsIDOMEvent** aResult NS_OUTPARAM, nsPresContext* aPresContext, class nsMutationEvent* aEvent);
NS_NewDOMMutationEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, class nsMutationEvent* aEvent);
nsresult
NS_NewDOMPopupBlockedEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, nsEvent* aEvent);
nsresult

2
dom/src/geolocation/nsGeolocation.cpp
Просмотреть файл

@ -949,7 +949,7 @@ nsGeolocation::WatchPosition(nsIDOMGeoPositionCallback *callback,
nsIDOMGeoPositionErrorCallback *errorCallback,
const jsval& options,
JSContext* cx,
PRInt32 *_retval NS_OUTPARAM)
PRInt32 *_retval)
{
NS_ENSURE_ARG_POINTER(callback);

2
dom/system/gonk/nsVolume.cpp
Просмотреть файл

@ -48,7 +48,7 @@ NS_IMETHODIMP nsVolume::GetState(PRInt32 *aState)
return NS_OK;
}
NS_IMETHODIMP nsVolume::GetStats(nsIVolumeStat **aResult NS_OUTPARAM)
NS_IMETHODIMP nsVolume::GetStats(nsIVolumeStat **aResult)
{
if (mState != STATE_MOUNTED) {
return NS_ERROR_NOT_AVAILABLE;

4
dom/system/gonk/nsVolumeService.cpp
Просмотреть файл

@ -53,7 +53,7 @@ nsVolumeService::~nsVolumeService()
}
/* nsIVolume getVolumeByName (in DOMString volName); */
NS_IMETHODIMP nsVolumeService::GetVolumeByName(const nsAString &aVolName, nsIVolume **aResult NS_OUTPARAM)
NS_IMETHODIMP nsVolumeService::GetVolumeByName(const nsAString &aVolName, nsIVolume **aResult)
{
nsRefPtr<nsVolume> vol = FindVolumeByName(aVolName);
if (!vol) {
@ -65,7 +65,7 @@ NS_IMETHODIMP nsVolumeService::GetVolumeByName(const nsAString &aVolName, nsIVol
}
/* nsIVolume getVolumeByPath (in DOMString path); */
NS_IMETHODIMP nsVolumeService::GetVolumeByPath(const nsAString &aPath, nsIVolume **aResult NS_OUTPARAM)
NS_IMETHODIMP nsVolumeService::GetVolumeByPath(const nsAString &aPath, nsIVolume **aResult)
{
nsCString utf8Path = NS_ConvertUTF16toUTF8(aPath);
char realPathBuf[PATH_MAX];

8
image/src/RasterImage.h
Просмотреть файл

@ -153,10 +153,10 @@ public:
NS_IMETHOD_(PRUint16) GetType(void);
NS_SCRIPTABLE NS_IMETHOD GetAnimated(bool *aAnimated);
NS_SCRIPTABLE NS_IMETHOD GetCurrentFrameIsOpaque(bool *aCurrentFrameIsOpaque);
NS_IMETHOD GetFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxASurface **_retval NS_OUTPARAM);
NS_IMETHOD GetImageContainer(mozilla::layers::ImageContainer **_retval NS_OUTPARAM);
NS_IMETHOD CopyFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxImageSurface **_retval NS_OUTPARAM);
NS_IMETHOD ExtractFrame(PRUint32 aWhichFrame, const nsIntRect & aRect, PRUint32 aFlags, imgIContainer **_retval NS_OUTPARAM);
NS_IMETHOD GetFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxASurface **_retval);
NS_IMETHOD GetImageContainer(mozilla::layers::ImageContainer **_retval);
NS_IMETHOD CopyFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxImageSurface **_retval);
NS_IMETHOD ExtractFrame(PRUint32 aWhichFrame, const nsIntRect & aRect, PRUint32 aFlags, imgIContainer **_retval);
NS_IMETHOD Draw(gfxContext *aContext, gfxPattern::GraphicsFilter aFilter, const gfxMatrix & aUserSpaceToImageSpace, const gfxRect & aFill, const nsIntRect & aSubimage, const nsIntSize & aViewportSize, PRUint32 aFlags);
NS_IMETHOD_(nsIFrame *) GetRootLayoutFrame(void);
NS_SCRIPTABLE NS_IMETHOD RequestDecode(void);

8
image/src/VectorImage.h
Просмотреть файл

@ -39,10 +39,10 @@ public:
NS_IMETHOD_(PRUint16) GetType(void);
NS_SCRIPTABLE NS_IMETHOD GetAnimated(bool *aAnimated);
NS_SCRIPTABLE NS_IMETHOD GetCurrentFrameIsOpaque(bool *aCurrentFrameIsOpaque);
NS_IMETHOD GetFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxASurface **_retval NS_OUTPARAM);
NS_IMETHOD GetImageContainer(mozilla::layers::ImageContainer **_retval NS_OUTPARAM) { *_retval = NULL; return NS_OK; }
NS_IMETHOD CopyFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxImageSurface **_retval NS_OUTPARAM);
NS_IMETHOD ExtractFrame(PRUint32 aWhichFrame, const nsIntRect & aRect, PRUint32 aFlags, imgIContainer **_retval NS_OUTPARAM);
NS_IMETHOD GetFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxASurface **_retval);
NS_IMETHOD GetImageContainer(mozilla::layers::ImageContainer **_retval) { *_retval = NULL; return NS_OK; }
NS_IMETHOD CopyFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxImageSurface **_retval);
NS_IMETHOD ExtractFrame(PRUint32 aWhichFrame, const nsIntRect & aRect, PRUint32 aFlags, imgIContainer **_retval);
NS_IMETHOD Draw(gfxContext *aContext, gfxPattern::GraphicsFilter aFilter, const gfxMatrix & aUserSpaceToImageSpace, const gfxRect & aFill, const nsIntRect & aSubimage, const nsIntSize & aViewportSize, PRUint32 aFlags);
NS_IMETHOD_(nsIFrame *) GetRootLayoutFrame(void);
NS_SCRIPTABLE NS_IMETHOD RequestDecode(void);

2
js/xpconnect/src/XPCException.cpp
Просмотреть файл

@ -120,7 +120,7 @@ nsXPCException::~nsXPCException()
/* [noscript] xpcexJSVal stealJSVal (); */
NS_IMETHODIMP
nsXPCException::StealJSVal(jsval *vp NS_OUTPARAM)
nsXPCException::StealJSVal(jsval *vp)
{
if (mThrownJSVal.IsHeld()) {
*vp = mThrownJSVal.Release();

4
js/xpconnect/src/XPCQuickStubs.h
Просмотреть файл

@ -403,7 +403,7 @@ castNativeFromWrapper(JSContext *cx,
nsISupports **pRef,
jsval *pVal,
XPCLazyCallContext *lccx,
nsresult *rv NS_OUTPARAM)
nsresult *rv)
{
XPCWrappedNative *wrapper;
XPCWrappedNativeTearOff *tearoff;
@ -510,7 +510,7 @@ castNativeArgFromWrapper(JSContext *cx,
PRUint32 bit,
nsISupports **pArgRef,
jsval *vp,
nsresult *rv NS_OUTPARAM)
nsresult *rv)
{
JSObject *src = xpc_qsUnwrapObj(v, pArgRef, rv);
if (!src)

8
js/xpconnect/src/XPCWrappedJSClass.cpp
Просмотреть файл

@ -543,7 +543,7 @@ NS_INTERFACE_MAP_END_AGGREGATED(mDelegate)
NS_IMETHODIMP
SameOriginCheckedComponent::CanCreateWrapper(const nsIID * iid,
char **_retval NS_OUTPARAM)
char **_retval)
{
// XXX This doesn't actually work because nsScriptSecurityManager doesn't
// know what to do with "sameOrigin" for canCreateWrapper.
@ -554,7 +554,7 @@ SameOriginCheckedComponent::CanCreateWrapper(const nsIID * iid,
NS_IMETHODIMP
SameOriginCheckedComponent::CanCallMethod(const nsIID * iid,
const PRUnichar *methodName,
char **_retval NS_OUTPARAM)
char **_retval)
{
*_retval = NS_strdup("sameOrigin");
return *_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
@ -563,7 +563,7 @@ SameOriginCheckedComponent::CanCallMethod(const nsIID * iid,
NS_IMETHODIMP
SameOriginCheckedComponent::CanGetProperty(const nsIID * iid,
const PRUnichar *propertyName,
char **_retval NS_OUTPARAM)
char **_retval)
{
*_retval = NS_strdup("sameOrigin");
return *_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
@ -572,7 +572,7 @@ SameOriginCheckedComponent::CanGetProperty(const nsIID * iid,
NS_IMETHODIMP
SameOriginCheckedComponent::CanSetProperty(const nsIID * iid,
const PRUnichar *propertyName,
char **_retval NS_OUTPARAM)
char **_retval)
{
*_retval = NS_strdup("sameOrigin");
return *_retval ? NS_OK : NS_ERROR_OUT_OF_MEMORY;

78
js/xpconnect/tests/components/native/xpctest_params.cpp
Просмотреть файл

@ -70,73 +70,73 @@ nsXPCTestParams::~nsXPCTestParams()
}
/* boolean testBoolean (in boolean a, inout boolean b); */
NS_IMETHODIMP nsXPCTestParams::TestBoolean(bool a, bool *b NS_INOUTPARAM, bool *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestBoolean(bool a, bool *b, bool *_retval)
{
GENERIC_METHOD_IMPL;
}
/* octet testOctet (in octet a, inout octet b); */
NS_IMETHODIMP nsXPCTestParams::TestOctet(PRUint8 a, PRUint8 *b NS_INOUTPARAM, PRUint8 *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestOctet(PRUint8 a, PRUint8 *b, PRUint8 *_retval)
{
GENERIC_METHOD_IMPL;
}
/* short testShort (in short a, inout short b); */
NS_IMETHODIMP nsXPCTestParams::TestShort(PRInt16 a, PRInt16 *b NS_INOUTPARAM, PRInt16 *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestShort(PRInt16 a, PRInt16 *b, PRInt16 *_retval)
{
GENERIC_METHOD_IMPL;
}
/* long testLong (in long a, inout long b); */
NS_IMETHODIMP nsXPCTestParams::TestLong(PRInt32 a, PRInt32 *b NS_INOUTPARAM, PRInt32 *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestLong(PRInt32 a, PRInt32 *b, PRInt32 *_retval)
{
GENERIC_METHOD_IMPL;
}
/* long long testLongLong (in long long a, inout long long b); */
NS_IMETHODIMP nsXPCTestParams::TestLongLong(PRInt64 a, PRInt64 *b NS_INOUTPARAM, PRInt64 *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestLongLong(PRInt64 a, PRInt64 *b, PRInt64 *_retval)
{
GENERIC_METHOD_IMPL;
}
/* unsigned short testUnsignedShort (in unsigned short a, inout unsigned short b); */
NS_IMETHODIMP nsXPCTestParams::TestUnsignedShort(PRUint16 a, PRUint16 *b NS_INOUTPARAM, PRUint16 *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestUnsignedShort(PRUint16 a, PRUint16 *b, PRUint16 *_retval)
{
GENERIC_METHOD_IMPL;
}
/* unsigned long testUnsignedLong (in unsigned long a, inout unsigned long b); */
NS_IMETHODIMP nsXPCTestParams::TestUnsignedLong(PRUint32 a, PRUint32 *b NS_INOUTPARAM, PRUint32 *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestUnsignedLong(PRUint32 a, PRUint32 *b, PRUint32 *_retval)
{
GENERIC_METHOD_IMPL;
}
/* unsigned long long testUnsignedLongLong (in unsigned long long a, inout unsigned long long b); */
NS_IMETHODIMP nsXPCTestParams::TestUnsignedLongLong(PRUint64 a, PRUint64 *b NS_INOUTPARAM, PRUint64 *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestUnsignedLongLong(PRUint64 a, PRUint64 *b, PRUint64 *_retval)
{
GENERIC_METHOD_IMPL;
}
/* float testFloat (in float a, inout float b); */
NS_IMETHODIMP nsXPCTestParams::TestFloat(float a, float *b NS_INOUTPARAM, float *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestFloat(float a, float *b, float *_retval)
{
GENERIC_METHOD_IMPL;
}
/* double testDouble (in double a, inout float b); */
NS_IMETHODIMP nsXPCTestParams::TestDouble(double a, float *b NS_INOUTPARAM, double *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestDouble(double a, float *b, double *_retval)
{
GENERIC_METHOD_IMPL;
}
/* char testChar (in char a, inout char b); */
NS_IMETHODIMP nsXPCTestParams::TestChar(char a, char *b NS_INOUTPARAM, char *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestChar(char a, char *b, char *_retval)
{
GENERIC_METHOD_IMPL;
}
/* string testString (in string a, inout string b); */
NS_IMETHODIMP nsXPCTestParams::TestString(const char * a, char * *b NS_INOUTPARAM, char * *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestString(const char * a, char * *b, char * *_retval)
{
nsDependentCString aprime(a);
nsDependentCString bprime(*b);
@ -151,13 +151,13 @@ NS_IMETHODIMP nsXPCTestParams::TestString(const char * a, char * *b NS_INOUTPARA
}
/* wchar testWchar (in wchar a, inout wchar b); */
NS_IMETHODIMP nsXPCTestParams::TestWchar(PRUnichar a, PRUnichar *b NS_INOUTPARAM, PRUnichar *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestWchar(PRUnichar a, PRUnichar *b, PRUnichar *_retval)
{
GENERIC_METHOD_IMPL;
}
/* wstring testWstring (in wstring a, inout wstring b); */
NS_IMETHODIMP nsXPCTestParams::TestWstring(const PRUnichar * a, PRUnichar * *b NS_INOUTPARAM, PRUnichar * *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestWstring(const PRUnichar * a, PRUnichar * *b, PRUnichar * *_retval)
{
nsDependentString aprime(a);
nsDependentString bprime(*b);
@ -172,32 +172,32 @@ NS_IMETHODIMP nsXPCTestParams::TestWstring(const PRUnichar * a, PRUnichar * *b N
}
/* DOMString testDOMString (in DOMString a, inout DOMString b); */
NS_IMETHODIMP nsXPCTestParams::TestDOMString(const nsAString & a, nsAString & b NS_INOUTPARAM, nsAString & _retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestDOMString(const nsAString & a, nsAString & b, nsAString & _retval)
{
STRING_METHOD_IMPL;
}
/* AString testAString (in AString a, inout AString b); */
NS_IMETHODIMP nsXPCTestParams::TestAString(const nsAString & a, nsAString & b NS_INOUTPARAM, nsAString & _retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestAString(const nsAString & a, nsAString & b, nsAString & _retval)
{
STRING_METHOD_IMPL;
}
/* AUTF8String testAUTF8String (in AUTF8String a, inout AUTF8String b); */
NS_IMETHODIMP nsXPCTestParams::TestAUTF8String(const nsACString & a, nsACString & b NS_INOUTPARAM, nsACString & _retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestAUTF8String(const nsACString & a, nsACString & b, nsACString & _retval)
{
STRING_METHOD_IMPL;
}
/* ACString testACString (in ACString a, inout ACString b); */
NS_IMETHODIMP nsXPCTestParams::TestACString(const nsACString & a, nsACString & b NS_INOUTPARAM, nsACString & _retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestACString(const nsACString & a, nsACString & b, nsACString & _retval)
{
STRING_METHOD_IMPL;
}
/* jsval testJsval (in jsval a, inout jsval b); */
NS_IMETHODIMP nsXPCTestParams::TestJsval(const jsval & a, jsval & b NS_INOUTPARAM, jsval *_retval NS_OUTPARAM)
NS_IMETHODIMP nsXPCTestParams::TestJsval(const jsval & a, jsval & b, jsval *_retval)
{
*_retval = b;
b = a;
@ -208,8 +208,8 @@ NS_IMETHODIMP nsXPCTestParams::TestJsval(const jsval & a, jsval & b NS_INOUTPARA
* inout unsigned long bLength, [array, size_is (bLength)] inout short b,
* out unsigned long rvLength, [array, size_is (rvLength), retval] out short rv); */
NS_IMETHODIMP nsXPCTestParams::TestShortArray(PRUint32 aLength, PRInt16 *a,
PRUint32 *bLength NS_INOUTPARAM, PRInt16 **b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, PRInt16 **rv NS_OUTPARAM)
PRUint32 *bLength, PRInt16 **b,
PRUint32 *rvLength, PRInt16 **rv)
{
BUFFER_METHOD_IMPL(PRInt16, 0, TAKE_OWNERSHIP_NOOP);
}
@ -218,8 +218,8 @@ NS_IMETHODIMP nsXPCTestParams::TestShortArray(PRUint32 aLength, PRInt16 *a,
* inout unsigned long bLength, [array, size_is (bLength)] inout double b,
* out unsigned long rvLength, [array, size_is (rvLength), retval] out double rv); */
NS_IMETHODIMP nsXPCTestParams::TestDoubleArray(PRUint32 aLength, double *a,
PRUint32 *bLength NS_INOUTPARAM, double **b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, double **rv NS_OUTPARAM)
PRUint32 *bLength, double **b,
PRUint32 *rvLength, double **rv)
{
BUFFER_METHOD_IMPL(double, 0, TAKE_OWNERSHIP_NOOP);
}
@ -228,8 +228,8 @@ NS_IMETHODIMP nsXPCTestParams::TestDoubleArray(PRUint32 aLength, double *a,
* inout unsigned long bLength, [array, size_is (bLength)] inout string b,
* out unsigned long rvLength, [array, size_is (rvLength), retval] out string rv); */
NS_IMETHODIMP nsXPCTestParams::TestStringArray(PRUint32 aLength, const char * *a,
PRUint32 *bLength NS_INOUTPARAM, char * **b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, char * **rv NS_OUTPARAM)
PRUint32 *bLength, char * **b,
PRUint32 *rvLength, char * **rv)
{
BUFFER_METHOD_IMPL(char*, 0, TAKE_OWNERSHIP_STRING);
}
@ -238,8 +238,8 @@ NS_IMETHODIMP nsXPCTestParams::TestStringArray(PRUint32 aLength, const char * *a
* inout unsigned long bLength, [array, size_is (bLength)] inout wstring b,
* out unsigned long rvLength, [array, size_is (rvLength), retval] out wstring rv); */
NS_IMETHODIMP nsXPCTestParams::TestWstringArray(PRUint32 aLength, const PRUnichar * *a,
PRUint32 *bLength NS_INOUTPARAM, PRUnichar * **b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, PRUnichar * **rv NS_OUTPARAM)
PRUint32 *bLength, PRUnichar * **b,
PRUint32 *rvLength, PRUnichar * **rv)
{
BUFFER_METHOD_IMPL(PRUnichar*, 0, TAKE_OWNERSHIP_WSTRING);
}
@ -248,8 +248,8 @@ NS_IMETHODIMP nsXPCTestParams::TestWstringArray(PRUint32 aLength, const PRUnicha
* inout unsigned long bLength, [array, size_is (bLength)] inout nsIXPCTestInterfaceA b,
* out unsigned long rvLength, [array, size_is (rvLength), retval] out nsIXPCTestInterfaceA rv); */
NS_IMETHODIMP nsXPCTestParams::TestInterfaceArray(PRUint32 aLength, nsIXPCTestInterfaceA **a,
PRUint32 *bLength NS_INOUTPARAM, nsIXPCTestInterfaceA * **b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, nsIXPCTestInterfaceA * **rv NS_OUTPARAM)
PRUint32 *bLength, nsIXPCTestInterfaceA * **b,
PRUint32 *rvLength, nsIXPCTestInterfaceA * **rv)
{
BUFFER_METHOD_IMPL(nsIXPCTestInterfaceA*, 0, TAKE_OWNERSHIP_INTERFACE);
}
@ -258,8 +258,8 @@ NS_IMETHODIMP nsXPCTestParams::TestInterfaceArray(PRUint32 aLength, nsIXPCTestIn
* inout unsigned long bLength, [size_is (bLength)] inout string b,
* out unsigned long rvLength, [size_is (rvLength), retval] out string rv); */
NS_IMETHODIMP nsXPCTestParams::TestSizedString(PRUint32 aLength, const char * a,
PRUint32 *bLength NS_INOUTPARAM, char * *b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, char * *rv NS_OUTPARAM)
PRUint32 *bLength, char * *b,
PRUint32 *rvLength, char * *rv)
{
BUFFER_METHOD_IMPL(char, 1, TAKE_OWNERSHIP_NOOP);
}
@ -268,8 +268,8 @@ NS_IMETHODIMP nsXPCTestParams::TestSizedString(PRUint32 aLength, const char * a,
* inout unsigned long bLength, [size_is (bLength)] inout wstring b,
* out unsigned long rvLength, [size_is (rvLength), retval] out wstring rv); */
NS_IMETHODIMP nsXPCTestParams::TestSizedWstring(PRUint32 aLength, const PRUnichar * a,
PRUint32 *bLength NS_INOUTPARAM, PRUnichar * *b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, PRUnichar * *rv NS_OUTPARAM)
PRUint32 *bLength, PRUnichar * *b,
PRUint32 *rvLength, PRUnichar * *rv)
{
BUFFER_METHOD_IMPL(PRUnichar, 1, TAKE_OWNERSHIP_NOOP);
}
@ -278,8 +278,8 @@ NS_IMETHODIMP nsXPCTestParams::TestSizedWstring(PRUint32 aLength, const PRUnicha
* inout nsIIDPtr bIID, [iid_is (bIID)] inout nsQIResult b,
* out nsIIDPtr rvIID, [iid_is (rvIID), retval] out nsQIResult rv); */
NS_IMETHODIMP nsXPCTestParams::TestInterfaceIs(const nsIID *aIID, void *a,
nsIID **bIID NS_INOUTPARAM, void **b NS_INOUTPARAM,
nsIID **rvIID NS_OUTPARAM, void **rv NS_OUTPARAM)
nsIID **bIID, void **b,
nsIID **rvIID, void **rv)
{
//
// Getting the buffers and ownership right here can be a little tricky.
@ -318,10 +318,10 @@ NS_IMETHODIMP nsXPCTestParams::TestInterfaceIs(const nsIID *aIID, void *a,
* [retval, array, size_is (rvLength), iid_is (rvIID)] out nsQIResult rv); */
NS_IMETHODIMP nsXPCTestParams::TestInterfaceIsArray(PRUint32 aLength, const nsIID *aIID,
void **a,
PRUint32 *bLength NS_INOUTPARAM, nsIID **bIID NS_INOUTPARAM,
void ***b NS_INOUTPARAM,
PRUint32 *rvLength NS_OUTPARAM, nsIID **rvIID NS_OUTPARAM,
void ***rv NS_OUTPARAM)
PRUint32 *bLength, nsIID **bIID,
void ***b,
PRUint32 *rvLength, nsIID **rvIID,
void ***rv)
{
// Transfer the IIDs. See the comments in TestInterfaceIs (above) for an
// explanation of what we're doing.

2
layout/inspector/src/nsFontFaceList.cpp
Просмотреть файл

@ -47,7 +47,7 @@ FindByIndex(gfxFontEntry* aKey, nsIDOMFontFace* aData, void* aUserData)
}
NS_IMETHODIMP
nsFontFaceList::Item(PRUint32 index, nsIDOMFontFace **_retval NS_OUTPARAM)
nsFontFaceList::Item(PRUint32 index, nsIDOMFontFace **_retval)
{
NS_ENSURE_TRUE(index < mFontFaces.Count(), NS_ERROR_INVALID_ARG);
FindByIndexData userData;

18
layout/style/nsCSSRules.cpp
Просмотреть файл

@ -1261,7 +1261,7 @@ DOMCI_DATA(CSSNameSpaceRule, css::NameSpaceRule)
// only after one of the first two. (css3-fonts only contemplates
// annotating URLs with formats, but we handle the general case.)
static void
AppendSerializedFontSrc(const nsCSSValue& src, nsAString & aResult NS_OUTPARAM)
AppendSerializedFontSrc(const nsCSSValue& src, nsAString & aResult)
{
NS_PRECONDITION(src.GetUnit() == eCSSUnit_Array,
"improper value unit for src:");
@ -1310,7 +1310,7 @@ AppendSerializedFontSrc(const nsCSSValue& src, nsAString & aResult NS_OUTPARAM)
// print all characters with at least four hex digits
static void
AppendSerializedUnicodePoint(PRUint32 aCode, nsACString &aBuf NS_OUTPARAM)
AppendSerializedUnicodePoint(PRUint32 aCode, nsACString &aBuf)
{
aBuf.Append(nsPrintfCString("%04X", aCode));
}
@ -1321,7 +1321,7 @@ AppendSerializedUnicodePoint(PRUint32 aCode, nsACString &aBuf NS_OUTPARAM)
// consolidated, but right now we don't do that.)
static void
AppendSerializedUnicodeRange(nsCSSValue const & aValue,
nsAString & aResult NS_OUTPARAM)
nsAString & aResult)
{
NS_PRECONDITION(aValue.GetUnit() == eCSSUnit_Null ||
aValue.GetUnit() == eCSSUnit_Array,
@ -1377,7 +1377,7 @@ NS_IMPL_RELEASE_USING_AGGREGATOR(nsCSSFontFaceStyleDecl, ContainingRule())
// helper for string GetPropertyValue and RemovePropertyValue
nsresult
nsCSSFontFaceStyleDecl::GetPropertyValue(nsCSSFontDesc aFontDescID,
nsAString & aResult NS_OUTPARAM) const
nsAString & aResult) const
{
NS_ENSURE_ARG_RANGE(aFontDescID, eCSSFontDesc_UNKNOWN,
eCSSFontDesc_COUNT - 1);
@ -1476,7 +1476,7 @@ nsCSSFontFaceStyleDecl::SetCssText(const nsAString & aCssText)
// DOMString getPropertyValue (in DOMString propertyName);
NS_IMETHODIMP
nsCSSFontFaceStyleDecl::GetPropertyValue(const nsAString & propertyName,
nsAString & aResult NS_OUTPARAM)
nsAString & aResult)
{
return GetPropertyValue(nsCSSProps::LookupFontDesc(propertyName), aResult);
}
@ -1484,7 +1484,7 @@ nsCSSFontFaceStyleDecl::GetPropertyValue(const nsAString & propertyName,
// nsIDOMCSSValue getPropertyCSSValue (in DOMString propertyName);
NS_IMETHODIMP
nsCSSFontFaceStyleDecl::GetPropertyCSSValue(const nsAString & propertyName,
nsIDOMCSSValue **aResult NS_OUTPARAM)
nsIDOMCSSValue **aResult)
{
// ??? nsDOMCSSDeclaration returns null/NS_OK, but that seems wrong.
return NS_ERROR_NOT_IMPLEMENTED;
@ -1493,7 +1493,7 @@ nsCSSFontFaceStyleDecl::GetPropertyCSSValue(const nsAString & propertyName,
// DOMString removeProperty (in DOMString propertyName) raises (DOMException);
NS_IMETHODIMP
nsCSSFontFaceStyleDecl::RemoveProperty(const nsAString & propertyName,
nsAString & aResult NS_OUTPARAM)
nsAString & aResult)
{
nsCSSFontDesc descID = nsCSSProps::LookupFontDesc(propertyName);
NS_ASSERTION(descID >= eCSSFontDesc_UNKNOWN &&
@ -1513,7 +1513,7 @@ nsCSSFontFaceStyleDecl::RemoveProperty(const nsAString & propertyName,
// DOMString getPropertyPriority (in DOMString propertyName);
NS_IMETHODIMP
nsCSSFontFaceStyleDecl::GetPropertyPriority(const nsAString & propertyName,
nsAString & aResult NS_OUTPARAM)
nsAString & aResult)
{
// font descriptors do not have priorities at present
aResult.Truncate();
@ -1547,7 +1547,7 @@ nsCSSFontFaceStyleDecl::GetLength(PRUint32 *aLength)
// DOMString item (in unsigned long index);
NS_IMETHODIMP
nsCSSFontFaceStyleDecl::Item(PRUint32 index, nsAString & aResult NS_OUTPARAM)
nsCSSFontFaceStyleDecl::Item(PRUint32 index, nsAString & aResult)
{
PRInt32 nset = -1;
for (nsCSSFontDesc id = nsCSSFontDesc(eCSSFontDesc_UNKNOWN + 1);

2
layout/style/nsCSSRules.h
Просмотреть файл

@ -162,7 +162,7 @@ public:
NS_DECL_NSIDOMCSSSTYLEDECLARATION
nsresult GetPropertyValue(nsCSSFontDesc aFontDescID,
nsAString & aResult NS_OUTPARAM) const;
nsAString & aResult) const;
protected:
friend class nsCSSFontFaceRule;

4
modules/libjar/nsZipArchive.h
Просмотреть файл

@ -375,9 +375,9 @@ class nsZipHandle {
friend class nsZipArchive;
friend class mozilla::FileLocation;
public:
static nsresult Init(nsIFile *file, nsZipHandle **ret NS_OUTPARAM);
static nsresult Init(nsIFile *file, nsZipHandle **ret);
static nsresult Init(nsZipArchive *zip, const char *entry,
nsZipHandle **ret NS_OUTPARAM);
nsZipHandle **ret);
NS_METHOD_(nsrefcnt) AddRef(void);
NS_METHOD_(nsrefcnt) Release(void);

6
netwerk/base/src/RedirectChannelRegistrar.cpp
Просмотреть файл

@ -37,7 +37,7 @@ RedirectChannelRegistrar::RedirectChannelRegistrar()
NS_IMETHODIMP
RedirectChannelRegistrar::RegisterChannel(nsIChannel *channel,
PRUint32 *_retval NS_OUTPARAM)
PRUint32 *_retval)
{
mRealChannels.Put(mId, channel);
*_retval = mId;
@ -53,7 +53,7 @@ RedirectChannelRegistrar::RegisterChannel(nsIChannel *channel,
NS_IMETHODIMP
RedirectChannelRegistrar::GetRegisteredChannel(PRUint32 id,
nsIChannel **_retval NS_OUTPARAM)
nsIChannel **_retval)
{
if (!mRealChannels.Get(id, _retval))
return NS_ERROR_NOT_AVAILABLE;
@ -75,7 +75,7 @@ RedirectChannelRegistrar::LinkChannels(PRUint32 id,
NS_IMETHODIMP
RedirectChannelRegistrar::GetParentChannel(PRUint32 id,
nsIParentChannel **_retval NS_OUTPARAM)
nsIParentChannel **_retval)
{
if (!mParentChannels.Get(id, _retval))
return NS_ERROR_NOT_AVAILABLE;

6
netwerk/base/src/nsPreloadedStream.cpp
Просмотреть файл

@ -41,7 +41,7 @@ nsPreloadedStream::Close()
NS_IMETHODIMP
nsPreloadedStream::Available(PRUint32 *_retval NS_OUTPARAM)
nsPreloadedStream::Available(PRUint32 *_retval)
{
PRUint32 avail = 0;
@ -54,7 +54,7 @@ nsPreloadedStream::Available(PRUint32 *_retval NS_OUTPARAM)
NS_IMETHODIMP
nsPreloadedStream::Read(char *aBuf, PRUint32 aCount,
PRUint32 *_retval NS_OUTPARAM)
PRUint32 *_retval)
{
if (!mLen)
return mStream->Read(aBuf, aCount, _retval);
@ -96,7 +96,7 @@ nsPreloadedStream::ReadSegments(nsWriteSegmentFun aWriter,
}
NS_IMETHODIMP
nsPreloadedStream::IsNonBlocking(bool *_retval NS_OUTPARAM)
nsPreloadedStream::IsNonBlocking(bool *_retval)
{
return mStream->IsNonBlocking(_retval);
}

4
netwerk/base/src/nsSerializationHelper.cpp
Просмотреть файл

@ -77,14 +77,14 @@ NS_IMPL_ISUPPORTS1(nsSerializationHelper, nsISerializationHelper)
NS_IMETHODIMP
nsSerializationHelper::SerializeToString(nsISerializable *serializable,
nsACString & _retval NS_OUTPARAM)
nsACString & _retval)
{
return NS_SerializeToString(serializable, _retval);
}
NS_IMETHODIMP
nsSerializationHelper::DeserializeObject(const nsACString & input,
nsISupports **_retval NS_OUTPARAM)
nsISupports **_retval)
{
return NS_DeserializeObject(input, _retval);
}

4
netwerk/base/src/nsSocketTransport2.cpp
Просмотреть файл

@ -1925,7 +1925,7 @@ nsSocketTransport::GetSelfAddr(PRNetAddr *addr)
/* nsINetAddr getScriptablePeerAddr (); */
NS_IMETHODIMP
nsSocketTransport::GetScriptablePeerAddr(nsINetAddr * *addr NS_OUTPARAM)
nsSocketTransport::GetScriptablePeerAddr(nsINetAddr * *addr)
{
PRNetAddr rawAddr;
@ -1941,7 +1941,7 @@ nsSocketTransport::GetScriptablePeerAddr(nsINetAddr * *addr NS_OUTPARAM)
/* nsINetAddr getScriptableSelfAddr (); */
NS_IMETHODIMP
nsSocketTransport::GetScriptableSelfAddr(nsINetAddr * *addr NS_OUTPARAM)
nsSocketTransport::GetScriptableSelfAddr(nsINetAddr * *addr)
{
PRNetAddr rawAddr;

4
netwerk/protocol/device/AndroidCaptureProvider.cpp
Просмотреть файл

@ -116,11 +116,11 @@ NS_IMETHODIMP AndroidCameraInputStream::IsNonBlocking(bool *aNonBlock) {
return NS_OK;
}
NS_IMETHODIMP AndroidCameraInputStream::Read(char *aBuffer, PRUint32 aCount, PRUint32 *aRead NS_OUTPARAM) {
NS_IMETHODIMP AndroidCameraInputStream::Read(char *aBuffer, PRUint32 aCount, PRUint32 *aRead) {
return ReadSegments(NS_CopySegmentToBuffer, aBuffer, aCount, aRead);
}
NS_IMETHODIMP AndroidCameraInputStream::ReadSegments(nsWriteSegmentFun aWriter, void *aClosure, PRUint32 aCount, PRUint32 *aRead NS_OUTPARAM) {
NS_IMETHODIMP AndroidCameraInputStream::ReadSegments(nsWriteSegmentFun aWriter, void *aClosure, PRUint32 aCount, PRUint32 *aRead) {
*aRead = 0;
nsresult rv;

4
netwerk/protocol/device/GonkCaptureProvider.cpp
Просмотреть файл

@ -407,11 +407,11 @@ NS_IMETHODIMP GonkCameraInputStream::IsNonBlocking(bool *aNonBlock) {
return NS_OK;
}
NS_IMETHODIMP GonkCameraInputStream::Read(char *aBuffer, PRUint32 aCount, PRUint32 *aRead NS_OUTPARAM) {
NS_IMETHODIMP GonkCameraInputStream::Read(char *aBuffer, PRUint32 aCount, PRUint32 *aRead) {
return ReadSegments(NS_CopySegmentToBuffer, aBuffer, aCount, aRead);
}
NS_IMETHODIMP GonkCameraInputStream::ReadSegments(nsWriteSegmentFun aWriter, void *aClosure, PRUint32 aCount, PRUint32 *aRead NS_OUTPARAM) {
NS_IMETHODIMP GonkCameraInputStream::ReadSegments(nsWriteSegmentFun aWriter, void *aClosure, PRUint32 aCount, PRUint32 *aRead) {
*aRead = 0;
nsresult rv;

6
netwerk/protocol/websocket/BaseWebSocketChannel.cpp
Просмотреть файл

@ -156,7 +156,7 @@ BaseWebSocketChannel::GetProtocolFlags(PRUint32 *aProtocolFlags)
NS_IMETHODIMP
BaseWebSocketChannel::NewURI(const nsACString & aSpec, const char *aOriginCharset,
nsIURI *aBaseURI, nsIURI **_retval NS_OUTPARAM)
nsIURI *aBaseURI, nsIURI **_retval)
{
LOG(("BaseWebSocketChannel::NewURI() %p\n", this));
@ -175,7 +175,7 @@ BaseWebSocketChannel::NewURI(const nsACString & aSpec, const char *aOriginCharse
}
NS_IMETHODIMP
BaseWebSocketChannel::NewChannel(nsIURI *aURI, nsIChannel **_retval NS_OUTPARAM)
BaseWebSocketChannel::NewChannel(nsIURI *aURI, nsIChannel **_retval)
{
LOG(("BaseWebSocketChannel::NewChannel() %p\n", this));
return NS_ERROR_NOT_IMPLEMENTED;
@ -183,7 +183,7 @@ BaseWebSocketChannel::NewChannel(nsIURI *aURI, nsIChannel **_retval NS_OUTPARAM)
NS_IMETHODIMP
BaseWebSocketChannel::AllowPort(PRInt32 port, const char *scheme,
bool *_retval NS_OUTPARAM)
bool *_retval)
{
LOG(("BaseWebSocketChannel::AllowPort() %p\n", this));

2
netwerk/protocol/websocket/BaseWebSocketChannel.h
Просмотреть файл

@ -27,7 +27,7 @@ class BaseWebSocketChannel : public nsIWebSocketChannel,
NS_DECL_NSIPROTOCOLHANDLER
NS_IMETHOD QueryInterface(const nsIID & uuid, void **result NS_OUTPARAM) = 0;
NS_IMETHOD QueryInterface(const nsIID & uuid, void **result) = 0;
NS_IMETHOD_(nsrefcnt ) AddRef(void) = 0;
NS_IMETHOD_(nsrefcnt ) Release(void) = 0;

2
netwerk/protocol/websocket/WebSocketChannel.cpp
Просмотреть файл

@ -2222,7 +2222,7 @@ WebSocketChannel::OnLookupComplete(nsICancelable *aRequest,
// nsIInterfaceRequestor
NS_IMETHODIMP
WebSocketChannel::GetInterface(const nsIID & iid, void **result NS_OUTPARAM)
WebSocketChannel::GetInterface(const nsIID & iid, void **result)
{
LOG(("WebSocketChannel::GetInterface() %p\n", this));

2
netwerk/protocol/websocket/WebSocketChannelParent.cpp
Просмотреть файл

@ -221,7 +221,7 @@ WebSocketChannelParent::ActorDestroy(ActorDestroyReason why)
//-----------------------------------------------------------------------------
NS_IMETHODIMP
WebSocketChannelParent::GetInterface(const nsIID & iid, void **result NS_OUTPARAM)
WebSocketChannelParent::GetInterface(const nsIID & iid, void **result)
{
LOG(("WebSocketChannelParent::GetInterface() %p\n", this));
if (mAuthProvider && iid.Equals(NS_GET_IID(nsIAuthPromptProvider)))

2
netwerk/protocol/wyciwyg/WyciwygChannelChild.cpp
Просмотреть файл

@ -662,7 +662,7 @@ WyciwygChannelChild::SetCharsetAndSource(PRInt32 aSource, const nsACString & aCh
/* ACString getCharsetAndSource (out long aSource); */
NS_IMETHODIMP
WyciwygChannelChild::GetCharsetAndSource(PRInt32 *aSource NS_OUTPARAM, nsACString & _retval)
WyciwygChannelChild::GetCharsetAndSource(PRInt32 *aSource, nsACString & _retval)
{
NS_ENSURE_TRUE((mState == WCC_ONSTART) ||
(mState == WCC_ONDATA) ||

2
security/manager/ssl/src/nsNSSIOLayer.cpp
Просмотреть файл

@ -197,7 +197,7 @@ NS_IMETHODIMP
nsNSSSocketInfo::JoinConnection(const nsACString & npnProtocol,
const nsACString & hostname,
PRInt32 port,
bool *_retval NS_OUTPARAM)
bool *_retval)
{
*_retval = false;

22
services/crypto/component/nsSyncJPAKE.cpp
Просмотреть файл

@ -125,12 +125,12 @@ static const char g[] =
"787F7DED3B30E1A22D09F1FBDA1ABBBFBF25CAE05A13F812E34563F99410E73B";
NS_IMETHODIMP nsSyncJPAKE::Round1(const nsACString & aSignerID,
nsACString & aGX1 NS_OUTPARAM,
nsACString & aGV1 NS_OUTPARAM,
nsACString & aR1 NS_OUTPARAM,
nsACString & aGX2 NS_OUTPARAM,
nsACString & aGV2 NS_OUTPARAM,
nsACString & aR2 NS_OUTPARAM)
nsACString & aGX1,
nsACString & aGV1,
nsACString & aR1,
nsACString & aGX2,
nsACString & aGV2,
nsACString & aR2)
{
NS_ENSURE_STATE(round == JPAKENotStarted);
NS_ENSURE_STATE(key == NULL);
@ -203,9 +203,9 @@ NS_IMETHODIMP nsSyncJPAKE::Round2(const nsACString & aPeerID,
const nsACString & aGX4,
const nsACString & aGV4,
const nsACString & aR4,
nsACString & aA NS_OUTPARAM,
nsACString & aGVA NS_OUTPARAM,
nsACString & aRA NS_OUTPARAM)
nsACString & aA,
nsACString & aGVA,
nsACString & aRA)
{
NS_ENSURE_STATE(round == JPAKEBeforeRound2);
NS_ENSURE_STATE(key != NULL);
@ -351,8 +351,8 @@ NS_IMETHODIMP nsSyncJPAKE::Final(const nsACString & aB,
const nsACString & aGVB,
const nsACString & aRB,
const nsACString & aHKDFInfo,
nsACString & aAES256Key NS_OUTPARAM,
nsACString & aHMAC256Key NS_OUTPARAM)
nsACString & aAES256Key,
nsACString & aHMAC256Key)
{
static const unsigned AES256_KEY_SIZE = 256 / 8;
static const unsigned HMAC_SHA256_KEY_SIZE = 256 / 8;

8
toolkit/crashreporter/nsExceptionHandler.h
Просмотреть файл

@ -78,7 +78,7 @@ void OOPInit();
// is non-NULL. The sequence parameter will be filled with an ordinal
// indicating which remote process crashed first.
bool TakeMinidumpForChild(PRUint32 childPid,
nsIFile** dump NS_OUTPARAM,
nsIFile** dump,
PRUint32* aSequence = NULL);
#if defined(XP_WIN)
@ -109,9 +109,9 @@ ThreadId CurrentThreadId();
// returned non-null on failure.
bool CreatePairedMinidumps(ProcessHandle childPid,
ThreadId childBlamedThread,
nsAString* pairGUID NS_OUTPARAM,
nsIFile** childDump NS_OUTPARAM,
nsIFile** parentDump NS_OUTPARAM);
nsAString* pairGUID,
nsIFile** childDump,
nsIFile** parentDump);
# if defined(XP_WIN32) || defined(XP_MACOSX)
// Parent-side API for children

12
toolkit/identity/IdentityCryptoService.cpp
Просмотреть файл

@ -363,8 +363,8 @@ KeyGenRunnable::KeyGenRunnable(KeyType keyType,
MOZ_WARN_UNUSED_RESULT nsresult
GenerateKeyPair(PK11SlotInfo * slot,
NS_OUTPARAM SECKEYPrivateKey ** privateKey,
NS_OUTPARAM SECKEYPublicKey ** publicKey,
SECKEYPrivateKey ** privateKey,
SECKEYPublicKey ** publicKey,
CK_MECHANISM_TYPE mechanism,
void * params)
{
@ -391,8 +391,8 @@ GenerateKeyPair(PK11SlotInfo * slot,
MOZ_WARN_UNUSED_RESULT nsresult
GenerateRSAKeyPair(PK11SlotInfo * slot,
NS_OUTPARAM SECKEYPrivateKey ** privateKey,
NS_OUTPARAM SECKEYPublicKey ** publicKey)
SECKEYPrivateKey ** privateKey,
SECKEYPublicKey ** publicKey)
{
MOZ_ASSERT(!NS_IsMainThread());
@ -405,8 +405,8 @@ GenerateRSAKeyPair(PK11SlotInfo * slot,
MOZ_WARN_UNUSED_RESULT nsresult
GenerateDSAKeyPair(PK11SlotInfo * slot,
NS_OUTPARAM SECKEYPrivateKey ** privateKey,
NS_OUTPARAM SECKEYPublicKey ** publicKey)
SECKEYPrivateKey ** privateKey,
SECKEYPublicKey ** publicKey)
{
MOZ_ASSERT(!NS_IsMainThread());

4
uriloader/exthandler/android/nsExternalSharingAppService.cpp
Просмотреть файл

@ -41,8 +41,8 @@ nsExternalSharingAppService::ShareWithDefault(const nsAString & data,
NS_IMETHODIMP
nsExternalSharingAppService::GetSharingApps(const nsAString & aMIMEType,
PRUint32 *aLen NS_OUTPARAM,
nsISharingHandlerApp ***aHandlers NS_OUTPARAM)
PRUint32 *aLen,
nsISharingHandlerApp ***aHandlers)
{
nsresult rv;
NS_NAMED_LITERAL_STRING(sendAction, "android.intent.action.SEND");

4
uriloader/exthandler/unix/nsMeegoExternalSharingAppService.cpp
Просмотреть файл

@ -44,8 +44,8 @@ nsExternalSharingAppService::ShareWithDefault(const nsAString & aData,
NS_IMETHODIMP
nsExternalSharingAppService::GetSharingApps(const nsAString & aMIMEType,
PRUint32 *aLen NS_OUTPARAM,
nsISharingHandlerApp ***aHandlers NS_OUTPARAM)
PRUint32 *aLen,
nsISharingHandlerApp ***aHandlers)
{
return NS_ERROR_NOT_IMPLEMENTED;
}

2
widget/android/AndroidBridge.cpp
Просмотреть файл

@ -2167,7 +2167,7 @@ nsAndroidBridge::~nsAndroidBridge()
}
/* void handleGeckoEvent (in AString message); */
NS_IMETHODIMP nsAndroidBridge::HandleGeckoMessage(const nsAString & message, nsAString &aRet NS_OUTPARAM)
NS_IMETHODIMP nsAndroidBridge::HandleGeckoMessage(const nsAString & message, nsAString &aRet)
{
AndroidBridge::Bridge()->HandleGeckoMessage(message, aRet);
return NS_OK;

4
widget/android/nsClipboard.cpp
Просмотреть файл

@ -110,7 +110,7 @@ nsClipboard::EmptyClipboard(PRInt32 aWhichClipboard)
NS_IMETHODIMP
nsClipboard::HasDataMatchingFlavors(const char **aFlavorList,
PRUint32 aLength, PRInt32 aWhichClipboard,
bool *aHasText NS_OUTPARAM)
bool *aHasText)
{
*aHasText = false;
if (aWhichClipboard != kGlobalClipboard)
@ -125,7 +125,7 @@ nsClipboard::HasDataMatchingFlavors(const char **aFlavorList,
}
NS_IMETHODIMP
nsClipboard::SupportsSelectionClipboard(bool *aIsSupported NS_OUTPARAM)
nsClipboard::SupportsSelectionClipboard(bool *aIsSupported)
{
*aIsSupported = false;
return NS_OK;

2
widget/android/nsFilePicker.cpp
Просмотреть файл

@ -113,7 +113,7 @@ NS_IMETHODIMP nsFilePicker::GetFileURL(nsIURI **aFileURL)
return CallQueryInterface(uri, aFileURL);
}
NS_IMETHODIMP nsFilePicker::Show(PRInt16 *_retval NS_OUTPARAM)
NS_IMETHODIMP nsFilePicker::Show(PRInt16 *_retval)
{
if (!mozilla::AndroidBridge::Bridge())
return NS_ERROR_NOT_IMPLEMENTED;

8
widget/xpwidgets/GfxInfoBase.cpp
Просмотреть файл

@ -511,7 +511,7 @@ GfxInfoBase::Init()
}
NS_IMETHODIMP
GfxInfoBase::GetFeatureStatus(PRInt32 aFeature, PRInt32* aStatus NS_OUTPARAM)
GfxInfoBase::GetFeatureStatus(PRInt32 aFeature, PRInt32* aStatus)
{
if (GetPrefValueForFeature(aFeature, *aStatus))
return NS_OK;
@ -703,7 +703,7 @@ GfxInfoBase::GetFeatureStatusImpl(PRInt32 aFeature,
NS_IMETHODIMP
GfxInfoBase::GetFeatureSuggestedDriverVersion(PRInt32 aFeature,
nsAString& aVersion NS_OUTPARAM)
nsAString& aVersion)
{
nsCString version;
if (GetPrefValueForDriverVersion(version)) {
@ -719,7 +719,7 @@ GfxInfoBase::GetFeatureSuggestedDriverVersion(PRInt32 aFeature,
NS_IMETHODIMP
GfxInfoBase::GetWebGLParameter(const nsAString& aParam,
nsAString& aResult NS_OUTPARAM)
nsAString& aResult)
{
return GfxInfoWebGL::GetWebGLParameter(aParam, aResult);
}
@ -793,7 +793,7 @@ GfxInfoBase::LogFailure(const nsACString &failure)
/* void getFailures ([optional] out unsigned long failureCount, [array, size_is (failureCount), retval] out string failures); */
/* XPConnect method of returning arrays is very ugly. Would not recommend. Fallable nsMemory::Alloc makes things worse */
NS_IMETHODIMP GfxInfoBase::GetFailures(PRUint32 *failureCount NS_OUTPARAM, char ***failures NS_OUTPARAM)
NS_IMETHODIMP GfxInfoBase::GetFailures(PRUint32 *failureCount, char ***failures)
{
NS_ENSURE_ARG_POINTER(failureCount);

8
widget/xpwidgets/GfxInfoBase.h
Просмотреть файл

@ -42,11 +42,11 @@ public:
// using GfxInfoBase::GetFeatureSuggestedDriverVersion;
// using GfxInfoBase::GetWebGLParameter;
// to import the relevant methods into their namespace.
NS_SCRIPTABLE NS_IMETHOD GetFeatureStatus(PRInt32 aFeature, PRInt32 *_retval NS_OUTPARAM);
NS_SCRIPTABLE NS_IMETHOD GetFeatureSuggestedDriverVersion(PRInt32 aFeature, nsAString & _retval NS_OUTPARAM);
NS_SCRIPTABLE NS_IMETHOD GetWebGLParameter(const nsAString & aParam, nsAString & _retval NS_OUTPARAM);
NS_SCRIPTABLE NS_IMETHOD GetFeatureStatus(PRInt32 aFeature, PRInt32 *_retval);
NS_SCRIPTABLE NS_IMETHOD GetFeatureSuggestedDriverVersion(PRInt32 aFeature, nsAString & _retval);
NS_SCRIPTABLE NS_IMETHOD GetWebGLParameter(const nsAString & aParam, nsAString & _retval);
NS_SCRIPTABLE NS_IMETHOD GetFailures(PRUint32 *failureCount NS_OUTPARAM, char ***failures NS_OUTPARAM);
NS_SCRIPTABLE NS_IMETHOD GetFailures(PRUint32 *failureCount, char ***failures);
NS_IMETHOD_(void) LogFailure(const nsACString &failure);
NS_SCRIPTABLE NS_IMETHOD GetInfo(JSContext*, jsval*);

6
xpcom/base/nscore.h
Просмотреть файл

@ -447,14 +447,8 @@ typedef PRUint32 nsrefcnt;
*/
#ifdef NS_STATIC_CHECKING
# define NS_SCRIPTABLE __attribute__((user("NS_script")))
# define NS_INPARAM __attribute__((user("NS_inparam")))
# define NS_OUTPARAM __attribute__((user("NS_outparam")))
# define NS_INOUTPARAM __attribute__((user("NS_inoutparam")))
#else
# define NS_SCRIPTABLE
# define NS_INPARAM
# define NS_OUTPARAM
# define NS_INOUTPARAM
#endif
/*

2
xpcom/ds/nsISupportsArray.idl
Просмотреть файл

@ -36,7 +36,7 @@ class nsISupportsArray;
typedef bool (*nsISupportsArrayEnumFunc)(nsISupports* aElement, void *aData);
nsresult
NS_NewArrayEnumerator(nsISimpleEnumerator* *result NS_OUTPARAM,
NS_NewArrayEnumerator(nsISimpleEnumerator* *result,
nsISupportsArray* array);
%}

2
xpcom/ds/nsStringEnumerator.cpp
Просмотреть файл

@ -147,7 +147,7 @@ nsStringEnumerator::GetNext(nsACString& aResult)
template<class T>
static inline nsresult
StringEnumeratorTail(T** aResult NS_INPARAM)
StringEnumeratorTail(T** aResult)
{
if (!*aResult)
return NS_ERROR_OUT_OF_MEMORY;

12
xpcom/ds/nsStringEnumerator.h
Просмотреть файл

@ -43,15 +43,15 @@
// NS_RELEASE(enumerator);
//
nsresult
NS_NewStringEnumerator(nsIStringEnumerator** aResult NS_OUTPARAM,
NS_NewStringEnumerator(nsIStringEnumerator** aResult,
const nsTArray<nsString>* aArray,
nsISupports* aOwner);
nsresult
NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult NS_OUTPARAM,
NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult,
const nsTArray<nsCString>* aArray);
nsresult
NS_NewStringEnumerator(nsIStringEnumerator** aResult NS_OUTPARAM,
NS_NewStringEnumerator(nsIStringEnumerator** aResult,
const nsTArray<nsString>* aArray);
// Adopting string enumerators assume ownership of the array and will
@ -64,11 +64,11 @@ NS_NewStringEnumerator(nsIStringEnumerator** aResult NS_OUTPARAM,
// array->AppendString("abcd");
// NS_NewAdoptingStringEnumerator(&result, array);
nsresult
NS_NewAdoptingStringEnumerator(nsIStringEnumerator** aResult NS_OUTPARAM,
NS_NewAdoptingStringEnumerator(nsIStringEnumerator** aResult,
nsTArray<nsString>* aArray);
nsresult
NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult NS_OUTPARAM,
NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult,
nsTArray<nsCString>* aArray);
@ -85,6 +85,6 @@ NS_NewAdoptingUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult NS_OUTPARAM
// }
//
nsresult
NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult NS_OUTPARAM,
NS_NewUTF8StringEnumerator(nsIUTF8StringEnumerator** aResult,
const nsTArray<nsCString>* aArray,
nsISupports* aOwner);

6
xpcom/ds/nsVariant.cpp
Просмотреть файл

@ -228,9 +228,9 @@ static void FreeArray(nsDiscriminatedUnion* data)
static nsresult CloneArray(PRUint16 inType, const nsIID* inIID,
PRUint32 inCount, void* inValue,
PRUint16* outType NS_OUTPARAM,
nsIID* outIID NS_OUTPARAM,
PRUint32* outCount NS_OUTPARAM,
PRUint16* outType,
nsIID* outIID,
PRUint32* outCount,
void** outValue)
{
NS_ASSERTION(inCount, "bad param");

16
xpcom/ds/nsVariant.h
Просмотреть файл

@ -107,19 +107,19 @@ public:
static nsresult ConvertToFloat(const nsDiscriminatedUnion& data, float *_retval);
static nsresult ConvertToDouble(const nsDiscriminatedUnion& data, double *_retval);
static nsresult ConvertToBool(const nsDiscriminatedUnion& data, bool *_retval);
static nsresult ConvertToChar(const nsDiscriminatedUnion& data, char *_retval NS_OUTPARAM);
static nsresult ConvertToWChar(const nsDiscriminatedUnion& data, PRUnichar *_retval NS_OUTPARAM);
static nsresult ConvertToID(const nsDiscriminatedUnion& data, nsID * _retval NS_OUTPARAM);
static nsresult ConvertToAString(const nsDiscriminatedUnion& data, nsAString & _retval NS_OUTPARAM);
static nsresult ConvertToChar(const nsDiscriminatedUnion& data, char *_retval);
static nsresult ConvertToWChar(const nsDiscriminatedUnion& data, PRUnichar *_retval);
static nsresult ConvertToID(const nsDiscriminatedUnion& data, nsID * _retval);
static nsresult ConvertToAString(const nsDiscriminatedUnion& data, nsAString & _retval);
static nsresult ConvertToAUTF8String(const nsDiscriminatedUnion& data, nsAUTF8String & _retval);
static nsresult ConvertToACString(const nsDiscriminatedUnion& data, nsACString & _retval);
static nsresult ConvertToString(const nsDiscriminatedUnion& data, char **_retval);
static nsresult ConvertToWString(const nsDiscriminatedUnion& data, PRUnichar **_retval);
static nsresult ConvertToISupports(const nsDiscriminatedUnion& data, nsISupports **_retval);
static nsresult ConvertToInterface(const nsDiscriminatedUnion& data, nsIID * *iid NS_OUTPARAM, void * *iface NS_OUTPARAM);
static nsresult ConvertToArray(const nsDiscriminatedUnion& data, PRUint16 *type NS_OUTPARAM, nsIID* iid NS_OUTPARAM, PRUint32 *count NS_OUTPARAM, void * *ptr);
static nsresult ConvertToStringWithSize(const nsDiscriminatedUnion& data, PRUint32 *size NS_OUTPARAM, char **str);
static nsresult ConvertToWStringWithSize(const nsDiscriminatedUnion& data, PRUint32 *size NS_OUTPARAM, PRUnichar **str);
static nsresult ConvertToInterface(const nsDiscriminatedUnion& data, nsIID * *iid, void * *iface);
static nsresult ConvertToArray(const nsDiscriminatedUnion& data, PRUint16 *type, nsIID* iid, PRUint32 *count, void * *ptr);
static nsresult ConvertToStringWithSize(const nsDiscriminatedUnion& data, PRUint32 *size, char **str);
static nsresult ConvertToWStringWithSize(const nsDiscriminatedUnion& data, PRUint32 *size, PRUnichar **str);
static nsresult SetFromVariant(nsDiscriminatedUnion* data, nsIVariant* aValue);

4
xpcom/glue/nsArrayEnumerator.h
Просмотреть файл

@ -17,7 +17,7 @@ class nsCOMArray_base;
// Create an enumerator for an existing nsIArray implementation
// The enumerator holds an owning reference to the array.
NS_COM_GLUE nsresult
NS_NewArrayEnumerator(nsISimpleEnumerator* *result NS_OUTPARAM,
NS_NewArrayEnumerator(nsISimpleEnumerator* *result,
nsIArray* array);
// create an enumerator for an existing nsCOMArray<T> implementation
@ -25,7 +25,7 @@ NS_NewArrayEnumerator(nsISimpleEnumerator* *result NS_OUTPARAM,
// the array. This means that the nsCOMArray<T> can safely go away
// without its objects going away.
NS_COM_GLUE nsresult
NS_NewArrayEnumerator(nsISimpleEnumerator* *aResult NS_OUTPARAM,
NS_NewArrayEnumerator(nsISimpleEnumerator* *aResult,
const nsCOMArray_base& aArray);
#endif

2
xpcom/glue/nsBaseHashtable.h
Просмотреть файл

@ -99,7 +99,7 @@ public:
* @return true if the key exists. If key does not exist, pData is not
* modified.
*/
bool Get(KeyType aKey, UserDataType* pData NS_OUTPARAM) const
bool Get(KeyType aKey, UserDataType* pData) const
{
EntryType* ent = this->GetEntry(aKey);

4
xpcom/glue/nsCOMPtr.h
Просмотреть файл

@ -740,7 +740,7 @@ class nsCOMPtr MOZ_FINAL
template <typename I>
void
forget( I** rhs NS_OUTPARAM )
forget( I** rhs )
// Set the target of rhs to the value of mRawPtr and null out mRawPtr.
// Useful to avoid unnecessary AddRef/Release pairs with "out"
// parameters where rhs bay be a T** or an I** where I is a base class
@ -1046,7 +1046,7 @@ class nsCOMPtr<nsISupports>
}
void
forget( nsISupports** rhs NS_OUTPARAM )
forget( nsISupports** rhs )
// Set the target of rhs to the value of mRawPtr and null out mRawPtr.
// Useful to avoid unnecessary AddRef/Release pairs with "out"
// parameters.

9
xpcom/glue/nsIClassInfoImpl.h
Просмотреть файл

@ -83,8 +83,8 @@ class NS_COM_GLUE GenericClassInfo : public nsIClassInfo
public:
struct ClassInfoData
{
typedef NS_CALLBACK(GetInterfacesProc)(PRUint32* NS_OUTPARAM countp,
nsIID*** NS_OUTPARAM array);
typedef NS_CALLBACK(GetInterfacesProc)(PRUint32* countp,
nsIID*** array);
typedef NS_CALLBACK(GetLanguageHelperProc)(PRUint32 language,
nsISupports** helper);
@ -109,7 +109,7 @@ private:
#define NS_CI_INTERFACE_GETTER_NAME(_class) _class##_GetInterfacesHelper
#define NS_DECL_CI_INTERFACE_GETTER(_class) \
extern NS_IMETHODIMP NS_CI_INTERFACE_GETTER_NAME(_class) \
(PRUint32 * NS_OUTPARAM, nsIID *** NS_OUTPARAM);
(PRUint32 *, nsIID ***);
#define NS_IMPL_CLASSINFO(_class, _getlanguagehelper, _flags, _cid) \
NS_DECL_CI_INTERFACE_GETTER(_class) \
@ -132,8 +132,7 @@ private:
#define NS_CLASSINFO_HELPER_BEGIN(_class, _c) \
NS_IMETHODIMP \
NS_CI_INTERFACE_GETTER_NAME(_class)(PRUint32 *count NS_OUTPARAM, \
nsIID ***array NS_OUTPARAM) \
NS_CI_INTERFACE_GETTER_NAME(_class)(PRUint32 *count, nsIID ***array) \
{ \
*count = _c; \
*array = (nsIID **)nsMemory::Alloc(sizeof (nsIID *) * _c);

4
xpcom/glue/nsInterfaceHashtable.h
Просмотреть файл

@ -33,7 +33,7 @@ public:
* @param pData This is an XPCOM getter, so pData is already_addrefed.
* If the key doesn't exist, pData will be set to nsnull.
*/
bool Get(KeyType aKey, UserDataType* pData NS_OUTPARAM) const;
bool Get(KeyType aKey, UserDataType* pData) const;
/**
* @copydoc nsBaseHashtable::Get
@ -70,7 +70,7 @@ public:
* @param pData This is an XPCOM getter, so pData is already_addrefed.
* If the key doesn't exist, pData will be set to nsnull.
*/
bool Get(KeyType aKey, UserDataType* pData NS_OUTPARAM) const;
bool Get(KeyType aKey, UserDataType* pData) const;
// GetWeak does not make sense on a multi-threaded hashtable, where another
// thread may remove the entry (and hence release it) as soon as GetWeak

2
xpcom/glue/nsTArray.h
Просмотреть файл

@ -790,7 +790,7 @@ public:
bool
GreatestIndexLtEq(const Item& item,
const Comparator& comp,
index_type* idx NS_OUTPARAM) const {
index_type* idx) const {
// Nb: we could replace all the uses of "BinaryIndexOf" with this
// function, but BinaryIndexOf will be oh-so-slightly faster so
// it's not strictly desired to do.

2
xpcom/glue/standalone/nsGlueLinking.h
Просмотреть файл

@ -10,7 +10,7 @@
#define XPCOM_DEPENDENT_LIBS_LIST "dependentlibs.list"
NS_HIDDEN_(nsresult)
XPCOMGlueLoad(const char *xpcomFile, GetFrozenFunctionsFunc *func NS_OUTPARAM);
XPCOMGlueLoad(const char *xpcomFile, GetFrozenFunctionsFunc *func);
NS_HIDDEN_(void)
XPCOMGlueUnload();

16
xpcom/idl-parser/header.py
Просмотреть файл

@ -51,14 +51,12 @@ def attributeParamlist(a, getter):
return ", ".join(l)
def attributeAsNative(a, getter):
scriptable = a.isScriptable() and "NS_SCRIPTABLE " or ""
deprecated = a.deprecated and "NS_DEPRECATED " or ""
params = {'scriptable': scriptable,
'deprecated': deprecated,
params = {'deprecated': deprecated,
'returntype': attributeReturnType(a, 'NS_IMETHOD'),
'binaryname': attributeNativeName(a, getter),
'paramlist': attributeParamlist(a, getter)}
return "%(deprecated)s%(scriptable)s%(returntype)s %(binaryname)s(%(paramlist)s)" % params
return "%(deprecated)s%(returntype)s %(binaryname)s(%(paramlist)s)" % params
def methodNativeName(m):
return m.binaryname is not None and m.binaryname or firstCap(m.name)
@ -106,14 +104,8 @@ def paramlistAsNative(m, empty='void'):
return ", ".join(l)
def paramAsNative(p):
if p.paramtype == 'in':
typeannotate = ''
else:
typeannotate = ' NS_%sPARAM' % p.paramtype.upper()
return "%s%s%s" % (p.nativeType(),
p.name,
typeannotate)
return "%s%s" % (p.nativeType(),
p.name)
def paramlistNames(m):
names = [p.name for p in m.params]

16
xpcom/string/public/nsReadableUtils.h
Просмотреть файл

@ -25,17 +25,17 @@ inline size_t Distance( const nsReadingIterator<char>& start, const nsReadingIte
return end.get() - start.get();
}
void LossyCopyUTF16toASCII( const nsAString& aSource, nsACString& aDest NS_OUTPARAM );
void CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest NS_OUTPARAM );
void LossyCopyUTF16toASCII( const nsAString& aSource, nsACString& aDest );
void CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest );
void LossyCopyUTF16toASCII( const PRUnichar* aSource, nsACString& aDest NS_OUTPARAM );
void CopyASCIItoUTF16( const char* aSource, nsAString& aDest NS_OUTPARAM );
void LossyCopyUTF16toASCII( const PRUnichar* aSource, nsACString& aDest );
void CopyASCIItoUTF16( const char* aSource, nsAString& aDest );
void CopyUTF16toUTF8( const nsAString& aSource, nsACString& aDest NS_OUTPARAM );
void CopyUTF8toUTF16( const nsACString& aSource, nsAString& aDest NS_OUTPARAM );
void CopyUTF16toUTF8( const nsAString& aSource, nsACString& aDest );
void CopyUTF8toUTF16( const nsACString& aSource, nsAString& aDest );
void CopyUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest NS_OUTPARAM );
void CopyUTF8toUTF16( const char* aSource, nsAString& aDest NS_OUTPARAM );
void CopyUTF16toUTF8( const PRUnichar* aSource, nsACString& aDest );
void CopyUTF8toUTF16( const char* aSource, nsAString& aDest );
void LossyAppendUTF16toASCII( const nsAString& aSource, nsACString& aDest );
void AppendASCIItoUTF16( const nsACString& aSource, nsAString& aDest );

9
xpcom/tests/static-checker/e1.cpp
Просмотреть файл

@ -1,9 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(__attribute__((user("outparam"))) int *a) {
int k = 0;
return k;
}

15
xpcom/tests/static-checker/e10.cpp
Просмотреть файл

@ -1,15 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
class nsACString;
nsresult bar(nsACString &a);
nsresult baz();
nsresult foo(nsACString &a) {
bar(a);
return baz();
}

11
xpcom/tests/static-checker/e11.cpp
Просмотреть файл

@ -1,11 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
nsresult bar(PRUnichar **a, int q);
nsresult foo(PRUnichar **a) {
return bar(a, 0);
}

10
xpcom/tests/static-checker/e12.cpp
Просмотреть файл

@ -1,10 +0,0 @@
typedef int bool;
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
bool bar(int *p __attribute__((user("NS_outparam")))) {
return 1;
}

9
xpcom/tests/static-checker/e13.cpp
Просмотреть файл

@ -1,9 +0,0 @@
typedef int bool;
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
void bar(int *p __attribute__((user("NS_outparam")))) {
}

9
xpcom/tests/static-checker/e2.cpp
Просмотреть файл

@ -1,9 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(__attribute__((user("outparam"))) int *a) {
*a = 9;
return 1;
}

11
xpcom/tests/static-checker/e4.cpp
Просмотреть файл

@ -1,11 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult bar(int *a);
nsresult foo(__attribute__((user("outparam"))) int *a) {
bar(a);
return 0;
}

9
xpcom/tests/static-checker/e5.cpp
Просмотреть файл

@ -1,9 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(__attribute__((user("inoutparam"))) int *a) {
*a = 9;
return 1;
}

14
xpcom/tests/static-checker/e6.cpp
Просмотреть файл

@ -1,14 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
class A {
};
nsresult bar(__attribute__((user("outparam"))) void **a);
nsresult foo(__attribute__((user("outparam"))) A **a) {
nsresult rv = bar((void **) a);
return 1;
}

11
xpcom/tests/static-checker/e7.cpp
Просмотреть файл

@ -1,11 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult bar(char **a, int q);
nsresult foo(char **a) {
bar(a, 0);
return 0;
}

8
xpcom/tests/static-checker/e8.cpp
Просмотреть файл

@ -1,8 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(char **a) {
return 0;
}

9
xpcom/tests/static-checker/e9.cpp
Просмотреть файл

@ -1,9 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
nsresult foo(PRUnichar **a) {
return 0;
}

9
xpcom/tests/static-checker/o1.cpp
Просмотреть файл

@ -1,9 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(__attribute__((user("outparam"))) int *a) {
*a = 1;
return 0;
}

22
xpcom/tests/static-checker/o10.cpp
Просмотреть файл

@ -1,22 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
class nsAString {
public:
void Read() const;
void Mutate();
};
nsresult bar();
nsresult foo(nsAString &s) {
nsresult rv = bar();
s.Read();
if (rv == 0) {
s.Mutate();
}
return rv;
}

9
xpcom/tests/static-checker/o11.cpp
Просмотреть файл

@ -1,9 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
nsresult foo(int *p __attribute__((user("NS_inparam")))) {
return 0;
}

22
xpcom/tests/static-checker/o12.cpp
Просмотреть файл

@ -1,22 +0,0 @@
typedef int bool;
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
#define NS_OUTPARAM __attribute__((user("NS_outparam")))
bool baz(int *p NS_OUTPARAM);
bool bar(int *p NS_OUTPARAM) {
return baz(p);
}
nsresult foo(int *p) {
if (bar(p)) {
return 0;
} else {
return 1;
}
}

14
xpcom/tests/static-checker/o13.cpp
Просмотреть файл

@ -1,14 +0,0 @@
typedef int bool;
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
nsresult baz(int *p);
void bar(int *p __attribute__((user("NS_outparam")))) {
if (baz(p) != 0) {
*p = 0;
}
}

24
xpcom/tests/static-checker/o14.cpp
Просмотреть файл

@ -1,24 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
inline int NS_FAILED(nsresult _nsresult) {
return _nsresult & 0x80000000;
}
inline int NS_SUCCEEDED(nsresult _nsresult) {
return !(_nsresult & 0x80000000);
}
int SomeFunc(nsresult *rv);
nsresult foo(__attribute__((user("NS_outparam"))) int *a) {
nsresult rv;
int i = SomeFunc(&rv);
if (NS_FAILED(rv))
return rv;
*a = i;
return 0;
}

20
xpcom/tests/static-checker/o15.cpp
Просмотреть файл

@ -1,20 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef nsresult (*xpcomFunc)(PRInt32 * __attribute__((user("NS_outparam"))) a,
PRInt32 ** __attribute__((user("NS_outparam"))) b);
struct A {
virtual nsresult TestMethod(PRInt32 *a __attribute__((user("NS_outparam"))),
PRInt32 **b __attribute__((user("NS_outparam"))));
struct FuncTable {
xpcomFunc mFunc;
} *mTable;
};
nsresult A::TestMethod(PRInt32 *a, PRInt32 **b)
{
return mTable->mFunc(a, b);
}

14
xpcom/tests/static-checker/o16.cpp
Просмотреть файл

@ -1,14 +0,0 @@
typedef int PRInt32;
typedef int nsresult;
void
OutFunc(PRInt32 *out __attribute__((user("NS_outparam"))))
{
*out = 0;
}
nsresult TestFunc(PRInt32 *a __attribute__((user("NS_outparam"))))
{
OutFunc(a);
return 0;
}

15
xpcom/tests/static-checker/o2.cpp
Просмотреть файл

@ -1,15 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
int x;
nsresult foo(__attribute__((user("outparam"))) int *a) {
if (x) {
*a = 1;
return 0;
} else {
return 1;
}
}

11
xpcom/tests/static-checker/o3.cpp
Просмотреть файл

@ -1,11 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(nsresult x, __attribute__((user("outparam"))) int *a) {
if (x == 0) {
*a = 1;
}
return x;
}

21
xpcom/tests/static-checker/o4.cpp
Просмотреть файл

@ -1,21 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult bar(__attribute__((user("outparam"))) int q);
inline int NS_FAILED(nsresult _nsresult) {
return _nsresult & 0x80000000;
}
inline int NS_SUCCEEDED(nsresult _nsresult) {
return !(_nsresult & 0x80000000);
}
nsresult foo(__attribute__((user("outparam"))) int *a) {
nsresult rv = bar(4);
if (NS_FAILED(rv)) return rv;
*a = 1;
return 0;
}

11
xpcom/tests/static-checker/o5.cpp
Просмотреть файл

@ -1,11 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult bar(__attribute__((user("outparam"))) int *a);
nsresult foo(__attribute__((user("outparam"))) int *a) {
int rv = bar(a);
return rv;
}

11
xpcom/tests/static-checker/o6.cpp
Просмотреть файл

@ -1,11 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(__attribute__((user("outparam"))) int *a) {
if (a) {
*a = 1;
}
return 0;
}

8
xpcom/tests/static-checker/o7.cpp
Просмотреть файл

@ -1,8 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(__attribute__((user("NS_inoutparam"))) int *a) {
return 0;
}

8
xpcom/tests/static-checker/o8.cpp
Просмотреть файл

@ -1,8 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(char *a) {
return 0;
}

9
xpcom/tests/static-checker/o9.cpp
Просмотреть файл

@ -1,9 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
typedef short PRUnichar;
nsresult foo(PRUnichar *a) {
return 0;
}

15
xpcom/tests/static-checker/onull.cpp
Просмотреть файл

@ -1,15 +0,0 @@
typedef int PRUint32;
typedef PRUint32 nsresult;
char *pseudomalloc();
nsresult foo(char **result)
{
*result = pseudomalloc();
if (!*result)
return 1;
// fill in *result
return 0;
}

9
xpcom/tests/static-checker/onull2.cpp
Просмотреть файл

@ -1,9 +0,0 @@
typedef int PRUint32;
typedef int PRInt32;
typedef PRUint32 nsresult;
nsresult foo(__attribute__((user("outparam"))) int *a) {
*a = 0;
return 1;
}

21
xpcom/tests/static-checker/opmember.cpp
Просмотреть файл

@ -1,21 +0,0 @@
/**
* Make sure treehydra/outparams don't choke on pointer-to-members.
*/
typedef int PRUint32;
typedef PRUint32 nsresult;
class A
{
int i;
int j;
};
nsresult
TestMethod(int A::* member,
__attribute__((user("outparam"))) int *out) {
*out = 1;
return 0;
}