nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 456388 - Remove PR_STATIC_CALLBACK and PR_CALLBACK(_DECL) from the tree; r+sr=brendan

Browse source
This commit is contained in:
Arpad Borsos 2008-10-10 17:04:34 +02:00
parent 4802b549e0
commit c72ef7d248
259 changed files with 850 additions and 871 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
accessible/src/base/nsAccessNode.h
View file

@ -102,7 +102,7 @@ class nsAccessNode: public nsIAccessNode,
void* aUniqueID, nsIAccessNode **aAccessNode); void* aUniqueID, nsIAccessNode **aAccessNode);
static void ClearCache(nsAccessNodeHashtable& aCache); static void ClearCache(nsAccessNodeHashtable& aCache);
static PLDHashOperator PR_CALLBACK ClearCacheEntry(const void* aKey, nsCOMPtr<nsIAccessNode>& aAccessNode, void* aUserArg); static PLDHashOperator ClearCacheEntry(const void* aKey, nsCOMPtr<nsIAccessNode>& aAccessNode, void* aUserArg);
// Static cache methods for global document cache // Static cache methods for global document cache
static already_AddRefed<nsIAccessibleDocument> GetDocAccessibleFor(nsIDocument *aDocument); static already_AddRefed<nsIAccessibleDocument> GetDocAccessibleFor(nsIDocument *aDocument);

2
accessible/src/base/nsDocAccessible.cpp
View file

@ -138,7 +138,7 @@ nsDocAccessible::~nsDocAccessible()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// nsDocAccessible. nsISupports // nsDocAccessible. nsISupports
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
ElementTraverser(const void *aKey, nsIAccessNode *aAccessNode, ElementTraverser(const void *aKey, nsIAccessNode *aAccessNode,
void *aUserArg) void *aUserArg)
{ {

12
caps/include/nsScriptSecurityManager.h
View file

@ -180,7 +180,7 @@ struct PropertyPolicy : public PLDHashEntryHdr
SecurityLevel mSet; SecurityLevel mSet;
}; };
PR_STATIC_CALLBACK(PRBool) static PRBool
InitPropertyPolicyEntry(PLDHashTable *table, InitPropertyPolicyEntry(PLDHashTable *table,
PLDHashEntryHdr *entry, PLDHashEntryHdr *entry,
const void *key) const void *key)
@ -192,7 +192,7 @@ InitPropertyPolicyEntry(PLDHashTable *table,
return PR_TRUE; return PR_TRUE;
} }
PR_STATIC_CALLBACK(void) static void
ClearPropertyPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry) ClearPropertyPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
{ {
PropertyPolicy* pp = (PropertyPolicy*)entry; PropertyPolicy* pp = (PropertyPolicy*)entry;
@ -212,7 +212,7 @@ struct ClassPolicy : public PLDHashEntryHdr
DomainPolicy* mDomainWeAreWildcardFor; DomainPolicy* mDomainWeAreWildcardFor;
}; };
PR_STATIC_CALLBACK(void) static void
ClearClassPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry) ClearClassPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
{ {
ClassPolicy* cp = (ClassPolicy *)entry; ClassPolicy* cp = (ClassPolicy *)entry;
@ -226,12 +226,12 @@ ClearClassPolicyEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
// Note: actual impl is going to be after the DomainPolicy class definition, // Note: actual impl is going to be after the DomainPolicy class definition,
// since we need to access members of DomainPolicy in the impl // since we need to access members of DomainPolicy in the impl
PR_STATIC_CALLBACK(void) static void
MoveClassPolicyEntry(PLDHashTable *table, MoveClassPolicyEntry(PLDHashTable *table,
const PLDHashEntryHdr *from, const PLDHashEntryHdr *from,
PLDHashEntryHdr *to); PLDHashEntryHdr *to);
PR_STATIC_CALLBACK(PRBool) static PRBool
InitClassPolicyEntry(PLDHashTable *table, InitClassPolicyEntry(PLDHashTable *table,
PLDHashEntryHdr *entry, PLDHashEntryHdr *entry,
const void *key) const void *key)
@ -344,7 +344,7 @@ private:
}; };
PR_STATIC_CALLBACK(void) static void
MoveClassPolicyEntry(PLDHashTable *table, MoveClassPolicyEntry(PLDHashTable *table,
const PLDHashEntryHdr *from, const PLDHashEntryHdr *from,
PLDHashEntryHdr *to) PLDHashEntryHdr *to)

8
caps/src/nsPrincipal.cpp
View file

@ -844,7 +844,7 @@ struct CapabilityList
nsCString* denied; nsCString* denied;
}; };
PR_STATIC_CALLBACK(PRBool) static PRBool
AppendCapability(nsHashKey *aKey, void *aData, void *capListPtr) AppendCapability(nsHashKey *aKey, void *aData, void *capListPtr)
{ {
CapabilityList* capList = (CapabilityList*)capListPtr; CapabilityList* capList = (CapabilityList*)capListPtr;
@ -971,7 +971,7 @@ nsPrincipal::GetPreferences(char** aPrefName, char** aID,
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(nsresult) static nsresult
ReadAnnotationEntry(nsIObjectInputStream* aStream, nsHashKey** aKey, ReadAnnotationEntry(nsIObjectInputStream* aStream, nsHashKey** aKey,
void** aData) void** aData)
{ {
@ -993,7 +993,7 @@ ReadAnnotationEntry(nsIObjectInputStream* aStream, nsHashKey** aKey,
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(void) static void
FreeAnnotationEntry(nsIObjectInputStream* aStream, nsHashKey* aKey, FreeAnnotationEntry(nsIObjectInputStream* aStream, nsHashKey* aKey,
void* aData) void* aData)
{ {
@ -1085,7 +1085,7 @@ nsPrincipal::Read(nsIObjectInputStream* aStream)
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(nsresult) static nsresult
WriteScalarValue(nsIObjectOutputStream* aStream, void* aData) WriteScalarValue(nsIObjectOutputStream* aStream, void* aData)
{ {
PRUint32 value = NS_PTR_TO_INT32(aData); PRUint32 value = NS_PTR_TO_INT32(aData);

16
caps/src/nsScriptSecurityManager.cpp
View file

@ -399,7 +399,7 @@ nsScriptSecurityManager::GetCxSubjectPrincipal(JSContext *cx)
//////////////////// ////////////////////
// Table of security levels // Table of security levels
PR_STATIC_CALLBACK(PRBool) static PRBool
DeleteCapability(nsHashKey *aKey, void *aData, void* closure) DeleteCapability(nsHashKey *aKey, void *aData, void* closure)
{ {
NS_Free(aData); NS_Free(aData);
@ -449,7 +449,7 @@ struct DomainEntry
#endif #endif
}; };
PR_STATIC_CALLBACK(PRBool) static PRBool
DeleteDomainEntry(nsHashKey *aKey, void *aData, void* closure) DeleteDomainEntry(nsHashKey *aKey, void *aData, void* closure)
{ {
DomainEntry *entry = (DomainEntry*) aData; DomainEntry *entry = (DomainEntry*) aData;
@ -3897,9 +3897,9 @@ nsScriptSecurityManager::InitPrefs()
#ifdef DEBUG_CAPS_HACKER #ifdef DEBUG_CAPS_HACKER
//typedef PLDHashOperator //typedef PLDHashOperator
//(* PR_CALLBACK PLDHashEnumerator)(PLDHashTable *table, PLDHashEntryHdr *hdr, //(* PLDHashEnumerator)(PLDHashTable *table, PLDHashEntryHdr *hdr,
// PRUint32 number, void *arg); // PRUint32 number, void *arg);
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
PrintPropertyPolicy(PLDHashTable *table, PLDHashEntryHdr *entry, PrintPropertyPolicy(PLDHashTable *table, PLDHashEntryHdr *entry,
PRUint32 number, void *arg) PRUint32 number, void *arg)
{ {
@ -3925,7 +3925,7 @@ PrintPropertyPolicy(PLDHashTable *table, PLDHashEntryHdr *entry,
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
PrintClassPolicy(PLDHashTable *table, PLDHashEntryHdr *entry, PrintClassPolicy(PLDHashTable *table, PLDHashEntryHdr *entry,
PRUint32 number, void *arg) PRUint32 number, void *arg)
{ {
@ -3937,8 +3937,8 @@ PrintClassPolicy(PLDHashTable *table, PLDHashEntryHdr *entry,
} }
// typedef PRBool // typedef PRBool
// (*PR_CALLBACK nsHashtableEnumFunc)(nsHashKey *aKey, void *aData, void* aClosure); // (* nsHashtableEnumFunc)(nsHashKey *aKey, void *aData, void* aClosure);
PR_STATIC_CALLBACK(PRBool) static PRBool
PrintDomainPolicy(nsHashKey *aKey, void *aData, void* aClosure) PrintDomainPolicy(nsHashKey *aKey, void *aData, void* aClosure)
{ {
DomainEntry* de = (DomainEntry*)aData; DomainEntry* de = (DomainEntry*)aData;
@ -3949,7 +3949,7 @@ PrintDomainPolicy(nsHashKey *aKey, void *aData, void* aClosure)
return PR_TRUE; return PR_TRUE;
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
PrintCapability(nsHashKey *aKey, void *aData, void* aClosure) PrintCapability(nsHashKey *aKey, void *aData, void* aClosure)
{ {
char* cap = (char*)aData; char* cap = (char*)aData;

14
caps/src/nsSecurityManagerFactory.cpp
View file

@ -130,7 +130,7 @@ getUTF8StringArgument(JSContext *cx, JSObject *obj, PRUint16 argNum,
CopyUTF16toUTF8(data, aRetval); CopyUTF16toUTF8(data, aRetval);
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc, netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval) jsval *argv, jsval *rval)
{ {
@ -153,7 +153,7 @@ netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc,
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc, netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval) jsval *argv, jsval *rval)
{ {
@ -175,7 +175,7 @@ netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
return JS_TRUE; return JS_TRUE;
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc, netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval) jsval *argv, jsval *rval)
{ {
@ -197,7 +197,7 @@ netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
return JS_TRUE; return JS_TRUE;
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc, netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval) jsval *argv, jsval *rval)
{ {
@ -219,7 +219,7 @@ netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc,
return JS_TRUE; return JS_TRUE;
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc, netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval) jsval *argv, jsval *rval)
{ {
@ -245,7 +245,7 @@ netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc
return JS_TRUE; return JS_TRUE;
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
netscape_security_invalidate(JSContext *cx, JSObject *obj, uintN argc, netscape_security_invalidate(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval) jsval *argv, jsval *rval)
{ {
@ -497,7 +497,7 @@ static const nsModuleComponentInfo capsComponentInfo[] =
}; };
void PR_CALLBACK void
CapsModuleDtor(nsIModule* thisModules) CapsModuleDtor(nsIModule* thisModules)
{ {
nsScriptSecurityManager::Shutdown(); nsScriptSecurityManager::Shutdown();

3
content/base/public/nsContentUtils.h
View file

@ -1359,8 +1359,7 @@ private:
static nsIDOMScriptObjectFactory *GetDOMScriptObjectFactory(); static nsIDOMScriptObjectFactory *GetDOMScriptObjectFactory();
static nsresult HoldScriptObject(PRUint32 aLangID, void* aObject); static nsresult HoldScriptObject(PRUint32 aLangID, void* aObject);
PR_STATIC_CALLBACK(void) DropScriptObject(PRUint32 aLangID, void *aObject, static void DropScriptObject(PRUint32 aLangID, void *aObject, void *aClosure);
void *aClosure);
static PRBool CanCallerAccess(nsIPrincipal* aSubjectPrincipal, static PRBool CanCallerAccess(nsIPrincipal* aSubjectPrincipal,
nsIPrincipal* aPrincipal); nsIPrincipal* aPrincipal);

2
content/base/src/mozSanitizingSerializer.cpp
View file

@ -107,7 +107,7 @@ mozSanitizingHTMLSerializer::~mozSanitizingHTMLSerializer()
} }
//<copy from="xpcom/ds/nsProperties.cpp"> //<copy from="xpcom/ds/nsProperties.cpp">
PRBool PR_CALLBACK PRBool
mozSanitizingHTMLSerializer::ReleaseProperties(nsHashKey* key, void* data, mozSanitizingHTMLSerializer::ReleaseProperties(nsHashKey* key, void* data,
void* closure) void* closure)
{ {

3
content/base/src/mozSanitizingSerializer.h
View file

@ -65,8 +65,7 @@ class mozSanitizingHTMLSerializer : public nsIContentSerializer,
public: public:
mozSanitizingHTMLSerializer(); mozSanitizingHTMLSerializer();
virtual ~mozSanitizingHTMLSerializer(); virtual ~mozSanitizingHTMLSerializer();
static PRBool PR_CALLBACK ReleaseProperties(nsHashKey* key, void* data, static PRBool ReleaseProperties(nsHashKey* key, void* data, void* closure);
void* closure);
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS

4
content/base/src/nsContentList.cpp
View file

@ -192,14 +192,14 @@ struct ContentListHashEntry : public PLDHashEntryHdr
nsContentList* mContentList; nsContentList* mContentList;
}; };
PR_STATIC_CALLBACK(PLDHashNumber) static PLDHashNumber
ContentListHashtableHashKey(PLDHashTable *table, const void *key) ContentListHashtableHashKey(PLDHashTable *table, const void *key)
{ {
const nsContentListKey* list = static_cast<const nsContentListKey *>(key); const nsContentListKey* list = static_cast<const nsContentListKey *>(key);
return list->GetHash(); return list->GetHash();
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
ContentListHashtableMatchEntry(PLDHashTable *table, ContentListHashtableMatchEntry(PLDHashTable *table,
const PLDHashEntryHdr *entry, const PLDHashEntryHdr *entry,
const void *key) const void *key)

6
content/base/src/nsContentUtils.cpp
View file

@ -242,7 +242,7 @@ public:
nsCOMPtr<nsIEventListenerManager> mListenerManager; nsCOMPtr<nsIEventListenerManager> mListenerManager;
}; };
PR_STATIC_CALLBACK(PRBool) static PRBool
EventListenerManagerHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, EventListenerManagerHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,
const void *key) const void *key)
{ {
@ -251,7 +251,7 @@ EventListenerManagerHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,
return PR_TRUE; return PR_TRUE;
} }
PR_STATIC_CALLBACK(void) static void
EventListenerManagerHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) EventListenerManagerHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
{ {
EventListenerManagerMapEntry *lm = EventListenerManagerMapEntry *lm =
@ -2600,7 +2600,7 @@ nsContentUtils::UnregisterPrefCallback(const char *aPref,
sPref->UnregisterCallback(aPref, aCallback, aClosure); sPref->UnregisterCallback(aPref, aCallback, aClosure);
} }
static int PR_CALLBACK static int
BoolVarChanged(const char *aPref, void *aClosure) BoolVarChanged(const char *aPref, void *aClosure)
{ {
PRBool* cache = static_cast<PRBool*>(aClosure); PRBool* cache = static_cast<PRBool*>(aClosure);

28
content/base/src/nsDocument.cpp
View file

@ -271,7 +271,7 @@ nsUint32ToContentHashEntry::InitHashSet(HashSet** aSet)
return NS_OK; return NS_OK;
} }
static PLDHashOperator PR_CALLBACK static PLDHashOperator
nsUint32ToContentHashEntryVisitorCallback(nsISupportsHashKey* aEntry, nsUint32ToContentHashEntryVisitorCallback(nsISupportsHashKey* aEntry,
void* aClosure) void* aClosure)
{ {
@ -395,7 +395,7 @@ struct FireChangeArgs {
nsIContent* mTo; nsIContent* mTo;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
FireChangeEnumerator(nsIdentifierMapEntry::ChangeCallbackEntry *aEntry, void *aArg) FireChangeEnumerator(nsIdentifierMapEntry::ChangeCallbackEntry *aEntry, void *aArg)
{ {
FireChangeArgs* args = static_cast<FireChangeArgs*>(aArg); FireChangeArgs* args = static_cast<FireChangeArgs*>(aArg);
@ -1452,7 +1452,7 @@ nsDocument::nsDocument(const char* aContentType)
SetDOMStringToNull(mLastStyleSheetSet); SetDOMStringToNull(mLastStyleSheetSet);
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
ClearAllBoxObjects(const void* aKey, nsPIBoxObject* aBoxObject, void* aUserArg) ClearAllBoxObjects(const void* aKey, nsPIBoxObject* aBoxObject, void* aUserArg)
{ {
if (aBoxObject) { if (aBoxObject) {
@ -1616,7 +1616,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS_WITH_DESTROY(nsDocument,
nsNodeUtils::LastRelease(this)) nsNodeUtils::LastRelease(this))
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number,
void *arg) void *arg)
{ {
@ -1632,7 +1632,7 @@ SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number,
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
RadioGroupsTraverser(const nsAString& aKey, nsRadioGroupStruct* aData, RadioGroupsTraverser(const nsAString& aKey, nsRadioGroupStruct* aData,
void* aClosure) void* aClosure)
{ {
@ -1653,7 +1653,7 @@ RadioGroupsTraverser(const nsAString& aKey, nsRadioGroupStruct* aData,
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
BoxObjectTraverser(const void* key, nsPIBoxObject* boxObject, void* userArg) BoxObjectTraverser(const void* key, nsPIBoxObject* boxObject, void* userArg)
{ {
nsCycleCollectionTraversalCallback *cb = nsCycleCollectionTraversalCallback *cb =
@ -1676,7 +1676,7 @@ public:
} }
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
LinkMapTraverser(nsUint32ToContentHashEntry* aEntry, void* userArg) LinkMapTraverser(nsUint32ToContentHashEntry* aEntry, void* userArg)
{ {
LinkMapTraversalVisitor visitor; LinkMapTraversalVisitor visitor;
@ -1685,7 +1685,7 @@ LinkMapTraverser(nsUint32ToContentHashEntry* aEntry, void* userArg)
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
IdentifierMapEntryTraverse(nsIdentifierMapEntry *aEntry, void *aArg) IdentifierMapEntryTraverse(nsIdentifierMapEntry *aEntry, void *aArg)
{ {
nsCycleCollectionTraversalCallback *cb = nsCycleCollectionTraversalCallback *cb =
@ -2971,7 +2971,7 @@ nsDocument::GetPrimaryShell() const
return mShellsAreHidden ? nsnull : mPresShells.SafeElementAt(0, nsnull); return mShellsAreHidden ? nsnull : mPresShells.SafeElementAt(0, nsnull);
} }
PR_STATIC_CALLBACK(void) static void
SubDocClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) SubDocClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
{ {
SubDocMapEntry *e = static_cast<SubDocMapEntry *>(entry); SubDocMapEntry *e = static_cast<SubDocMapEntry *>(entry);
@ -2983,7 +2983,7 @@ SubDocClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
} }
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
SubDocInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key) SubDocInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key)
{ {
SubDocMapEntry *e = SubDocMapEntry *e =
@ -3082,7 +3082,7 @@ nsDocument::GetSubDocumentFor(nsIContent *aContent) const
return nsnull; return nsnull;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
FindContentEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr, FindContentEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr,
PRUint32 number, void *arg) PRUint32 number, void *arg)
{ {
@ -5707,7 +5707,7 @@ nsDocument::SetDocumentURI(const nsAString& aDocumentURI)
static void BlastSubtreeToPieces(nsINode *aNode); static void BlastSubtreeToPieces(nsINode *aNode);
PLDHashOperator PR_CALLBACK PLDHashOperator
BlastFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg) BlastFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg)
{ {
nsCOMPtr<nsIAttribute> *attr = nsCOMPtr<nsIAttribute> *attr =
@ -6756,7 +6756,7 @@ struct SubDocEnumArgs
void *data; void *data;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
SubDocHashEnum(PLDHashTable *table, PLDHashEntryHdr *hdr, SubDocHashEnum(PLDHashTable *table, PLDHashEntryHdr *hdr,
PRUint32 number, void *arg) PRUint32 number, void *arg)
{ {
@ -6778,7 +6778,7 @@ nsDocument::EnumerateSubDocuments(nsSubDocEnumFunc aCallback, void *aData)
} }
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
CanCacheSubDocument(PLDHashTable *table, PLDHashEntryHdr *hdr, CanCacheSubDocument(PLDHashTable *table, PLDHashEntryHdr *hdr,
PRUint32 number, void *arg) PRUint32 number, void *arg)
{ {

4
content/base/src/nsDocument.h
View file

@ -136,9 +136,9 @@ PR_BEGIN_EXTERN_C
functions. That's the only way in which they differ from functions. That's the only way in which they differ from
PLHandleEventProc and PLDestroyEventProc. */ PLHandleEventProc and PLDestroyEventProc. */
typedef void* typedef void*
(PR_CALLBACK EventHandlerFunc)(PLEvent* self); (EventHandlerFunc)(PLEvent* self);
typedef void typedef void
(PR_CALLBACK EventDestructorFunc)(PLEvent* self); (EventDestructorFunc)(PLEvent* self);
PR_END_EXTERN_C PR_END_EXTERN_C
/** /**

7
content/base/src/nsGenericElement.cpp
View file

@ -5072,8 +5072,7 @@ ParseSelectorList(nsINode* aNode,
* the callbacks returns false, the iteration should be stopped. * the callbacks returns false, the iteration should be stopped.
*/ */
typedef PRBool typedef PRBool
(* PR_CALLBACK ElementMatchedCallback)(nsIContent* aMatchingElement, (* ElementMatchedCallback)(nsIContent* aMatchingElement, void* aClosure);
void* aClosure);
// returning false means stop iteration // returning false means stop iteration
static PRBool static PRBool
@ -5169,7 +5168,7 @@ TryMatchingElementsInSubtree(nsINode* aRoot,
return continueIteration; return continueIteration;
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
FindFirstMatchingElement(nsIContent* aMatchingElement, FindFirstMatchingElement(nsIContent* aMatchingElement,
void* aClosure) void* aClosure)
{ {
@ -5205,7 +5204,7 @@ nsGenericElement::doQuerySelector(nsINode* aRoot, const nsAString& aSelector,
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
AppendAllMatchingElements(nsIContent* aMatchingElement, AppendAllMatchingElements(nsIContent* aMatchingElement,
void* aClosure) void* aClosure)
{ {

5
content/base/src/nsNodeInfoManager.h
View file

@ -151,9 +151,8 @@ protected:
void SetDocumentPrincipal(nsIPrincipal *aPrincipal); void SetDocumentPrincipal(nsIPrincipal *aPrincipal);
private: private:
static PRIntn PR_CALLBACK NodeInfoInnerKeyCompare(const void *key1, static PRIntn NodeInfoInnerKeyCompare(const void *key1, const void *key2);
const void *key2); static PLHashNumber GetNodeInfoInnerHashValue(const void *key);
static PLHashNumber PR_CALLBACK GetNodeInfoInnerHashValue(const void *key);
nsAutoRefCnt mRefCnt; nsAutoRefCnt mRefCnt;
NS_DECL_OWNINGTHREAD NS_DECL_OWNINGTHREAD

2
content/base/src/nsNodeUtils.cpp
View file

@ -458,7 +458,7 @@ public:
nsCOMArray<nsINode> &mNodesWithProperties; nsCOMArray<nsINode> &mNodesWithProperties;
}; };
PLDHashOperator PR_CALLBACK PLDHashOperator
AdoptFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg) AdoptFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg)
{ {
nsCOMPtr<nsIAttribute> attr = do_QueryInterface(aData); nsCOMPtr<nsIAttribute> attr = do_QueryInterface(aData);

2
content/base/src/nsNodeUtils.h
View file

@ -270,7 +270,7 @@ public:
static void UnlinkUserData(nsINode *aNode); static void UnlinkUserData(nsINode *aNode);
private: private:
friend PLDHashOperator PR_CALLBACK friend PLDHashOperator
AdoptFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg); AdoptFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg);
/** /**

2
content/base/src/nsPropertyTable.cpp
View file

@ -324,7 +324,7 @@ nsPropertyTable::PropertyList::~PropertyList()
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
DestroyPropertyEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr, DestroyPropertyEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr,
PRUint32 number, void *arg) PRUint32 number, void *arg)
{ {

2
content/base/src/nsXMLNameSpaceMap.cpp
View file

@ -182,7 +182,7 @@ nsXMLNameSpaceMap::FindPrefix(PRInt32 aNameSpaceID) const
return nsnull; return nsnull;
} }
PR_STATIC_CALLBACK(PRBool) DeleteEntry(void *aElement, void *aData) static PRBool DeleteEntry(void *aElement, void *aData)
{ {
delete static_cast<nsNameSpaceEntry*>(aElement); delete static_cast<nsNameSpaceEntry*>(aElement);
return PR_TRUE; return PR_TRUE;

2
content/events/src/nsDOMDataContainerEvent.h
View file

@ -57,7 +57,7 @@ public:
NS_DECL_NSIDOMDATACONTAINEREVENT NS_DECL_NSIDOMDATACONTAINEREVENT
private: private:
static PLDHashOperator PR_CALLBACK static PLDHashOperator
TraverseEntry(const nsAString& aKey, nsIVariant *aDataItem, void* aUserArg); TraverseEntry(const nsAString& aKey, nsIVariant *aDataItem, void* aUserArg);
nsInterfaceHashtable<nsStringHashKey, nsIVariant> mData; nsInterfaceHashtable<nsStringHashKey, nsIVariant> mData;

4
content/events/src/nsXMLEventsManager.cpp
View file

@ -251,7 +251,7 @@ nsXMLEventsListener::HandleEvent(nsIDOMEvent* aEvent)
//XMLEventsManager / DocumentObserver //XMLEventsManager / DocumentObserver
PR_STATIC_CALLBACK(PLDHashOperator) EnumAndUnregisterListener(nsISupports * aContent, static PLDHashOperator EnumAndUnregisterListener(nsISupports * aContent,
nsCOMPtr<nsXMLEventsListener> & aListener, nsCOMPtr<nsXMLEventsListener> & aListener,
void * aData) void * aData)
{ {
@ -260,7 +260,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) EnumAndUnregisterListener(nsISupports * aCon
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
PR_STATIC_CALLBACK(PLDHashOperator) EnumAndSetIncomplete(nsISupports * aContent, static PLDHashOperator EnumAndSetIncomplete(nsISupports * aContent,
nsCOMPtr<nsXMLEventsListener> & aListener, nsCOMPtr<nsXMLEventsListener> & aListener,
void * aData) void * aData)
{ {

4
content/html/content/src/nsHTMLFormElement.cpp
View file

@ -527,7 +527,7 @@ nsHTMLFormElement::Init()
// nsISupports // nsISupports
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
ElementTraverser(const nsAString& key, nsIDOMHTMLInputElement* element, ElementTraverser(const nsAString& key, nsIDOMHTMLInputElement* element,
void* userArg) void* userArg)
{ {
@ -2092,7 +2092,7 @@ nsFormControlList::FlushPendingNotifications()
} }
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
ControlTraverser(const nsAString& key, nsISupports* control, void* userArg) ControlTraverser(const nsAString& key, nsISupports* control, void* userArg)
{ {
nsCycleCollectionTraversalCallback *cb = nsCycleCollectionTraversalCallback *cb =

2
content/html/content/src/nsHTMLTableRowElement.cpp
View file

@ -229,7 +229,7 @@ nsHTMLTableRowElement::GetSectionRowIndex(PRInt32* aValue)
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
IsCell(nsIContent *aContent, PRInt32 aNamespaceID, IsCell(nsIContent *aContent, PRInt32 aNamespaceID,
nsIAtom* aAtom, void *aData) nsIAtom* aAtom, void *aData)
{ {

2
content/html/document/src/nsHTMLDocument.cpp
View file

@ -177,7 +177,7 @@ static PRBool ConvertToMidasInternalCommand(const nsAString & inCommandID,
static PRBool ConvertToMidasInternalCommand(const nsAString & inCommandID, static PRBool ConvertToMidasInternalCommand(const nsAString & inCommandID,
nsACString& outCommandID); nsACString& outCommandID);
static int PR_CALLBACK static int
MyPrefChangedCallback(const char*aPrefName, void* instance_data) MyPrefChangedCallback(const char*aPrefName, void* instance_data)
{ {
const nsAdoptingString& detector_name = const nsAdoptingString& detector_name =

14
content/xbl/src/nsBindingManager.cpp
View file

@ -231,14 +231,14 @@ private:
nsCOMPtr<nsISupports> mValue; nsCOMPtr<nsISupports> mValue;
}; };
PR_STATIC_CALLBACK(void) static void
ClearObjectEntry(PLDHashTable* table, PLDHashEntryHdr *entry) ClearObjectEntry(PLDHashTable* table, PLDHashEntryHdr *entry)
{ {
ObjectEntry* objEntry = static_cast<ObjectEntry*>(entry); ObjectEntry* objEntry = static_cast<ObjectEntry*>(entry);
objEntry->~ObjectEntry(); objEntry->~ObjectEntry();
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
InitObjectEntry(PLDHashTable* table, PLDHashEntryHdr* entry, const void* key) InitObjectEntry(PLDHashTable* table, PLDHashEntryHdr* entry, const void* key)
{ {
new (entry) ObjectEntry; new (entry) ObjectEntry;
@ -448,7 +448,7 @@ nsBindingManager::~nsBindingManager(void)
} }
PLDHashOperator PLDHashOperator
PR_CALLBACK RemoveInsertionParentCB(PLDHashTable* aTable, PLDHashEntryHdr* aEntry, RemoveInsertionParentCB(PLDHashTable* aTable, PLDHashEntryHdr* aEntry,
PRUint32 aNumber, void* aArg) PRUint32 aNumber, void* aArg)
{ {
return (static_cast<ObjectEntry*>(aEntry)->GetValue() == return (static_cast<ObjectEntry*>(aEntry)->GetValue() ==
@ -1018,7 +1018,7 @@ struct BindingTableReadClosure
nsBindingList mBindings; nsBindingList mBindings;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
AccumulateBindingsToDetach(nsISupports *aKey, nsXBLBinding *aBinding, AccumulateBindingsToDetach(nsISupports *aKey, nsXBLBinding *aBinding,
void* aClosure) void* aClosure)
{ {
@ -1109,7 +1109,7 @@ nsBindingManager::RemoveLoadingDocListener(nsIURI* aURL)
} }
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
MarkForDeath(nsISupports *aKey, nsXBLBinding *aBinding, void* aClosure) MarkForDeath(nsISupports *aKey, nsXBLBinding *aBinding, void* aClosure)
{ {
if (aBinding->MarkedForDeath()) if (aBinding->MarkedForDeath())
@ -1299,7 +1299,7 @@ nsBindingManager::WalkRules(nsIStyleRuleProcessor::EnumFunc aFunc,
typedef nsTHashtable<nsVoidPtrHashKey> RuleProcessorSet; typedef nsTHashtable<nsVoidPtrHashKey> RuleProcessorSet;
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
EnumRuleProcessors(nsISupports *aKey, nsXBLBinding *aBinding, void* aClosure) EnumRuleProcessors(nsISupports *aKey, nsXBLBinding *aBinding, void* aClosure)
{ {
RuleProcessorSet *set = static_cast<RuleProcessorSet*>(aClosure); RuleProcessorSet *set = static_cast<RuleProcessorSet*>(aClosure);
@ -1321,7 +1321,7 @@ struct MediumFeaturesChangedData {
PRBool *mRulesChanged; PRBool *mRulesChanged;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
EnumMediumFeaturesChanged(nsVoidPtrHashKey *aKey, void* aClosure) EnumMediumFeaturesChanged(nsVoidPtrHashKey *aKey, void* aClosure)
{ {
nsIStyleRuleProcessor *ruleProcessor = nsIStyleRuleProcessor *ruleProcessor =

8
content/xbl/src/nsXBLBinding.cpp
View file

@ -287,7 +287,7 @@ nsXBLBinding::~nsXBLBinding(void)
NS_RELEASE(info); NS_RELEASE(info);
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
TraverseKey(nsISupports* aKey, nsInsertionPointList* aData, void* aClosure) TraverseKey(nsISupports* aKey, nsInsertionPointList* aData, void* aClosure)
{ {
nsCycleCollectionTraversalCallback &cb = nsCycleCollectionTraversalCallback &cb =
@ -407,7 +407,7 @@ struct ContentListData : public EnumData {
{} {}
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
BuildContentLists(nsISupports* aKey, BuildContentLists(nsISupports* aKey,
nsAutoPtr<nsInsertionPointList>& aData, nsAutoPtr<nsInsertionPointList>& aData,
void* aClosure) void* aClosure)
@ -500,7 +500,7 @@ BuildContentLists(nsISupports* aKey,
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
RealizeDefaultContent(nsISupports* aKey, RealizeDefaultContent(nsISupports* aKey,
nsAutoPtr<nsInsertionPointList>& aData, nsAutoPtr<nsInsertionPointList>& aData,
void* aClosure) void* aClosure)
@ -561,7 +561,7 @@ RealizeDefaultContent(nsISupports* aKey,
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
ChangeDocumentForDefaultContent(nsISupports* aKey, ChangeDocumentForDefaultContent(nsISupports* aKey,
nsAutoPtr<nsInsertionPointList>& aData, nsAutoPtr<nsInsertionPointList>& aData,
void* aClosure) void* aClosure)

20
content/xbl/src/nsXBLDocumentInfo.cpp
View file

@ -127,7 +127,7 @@ nsXBLDocGlobalObject::doCheckAccess(JSContext *cx, JSObject *obj, jsval id, PRUi
return NS_SUCCEEDED(rv); return NS_SUCCEEDED(rv);
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
nsXBLDocGlobalObject_getProperty(JSContext *cx, JSObject *obj, nsXBLDocGlobalObject_getProperty(JSContext *cx, JSObject *obj,
jsval id, jsval *vp) jsval id, jsval *vp)
{ {
@ -135,7 +135,7 @@ nsXBLDocGlobalObject_getProperty(JSContext *cx, JSObject *obj,
doCheckAccess(cx, obj, id, nsIXPCSecurityManager::ACCESS_GET_PROPERTY); doCheckAccess(cx, obj, id, nsIXPCSecurityManager::ACCESS_GET_PROPERTY);
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
nsXBLDocGlobalObject_setProperty(JSContext *cx, JSObject *obj, nsXBLDocGlobalObject_setProperty(JSContext *cx, JSObject *obj,
jsval id, jsval *vp) jsval id, jsval *vp)
{ {
@ -143,7 +143,7 @@ nsXBLDocGlobalObject_setProperty(JSContext *cx, JSObject *obj,
doCheckAccess(cx, obj, id, nsIXPCSecurityManager::ACCESS_SET_PROPERTY); doCheckAccess(cx, obj, id, nsIXPCSecurityManager::ACCESS_SET_PROPERTY);
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
nsXBLDocGlobalObject_checkAccess(JSContext *cx, JSObject *obj, jsval id, nsXBLDocGlobalObject_checkAccess(JSContext *cx, JSObject *obj, jsval id,
JSAccessMode mode, jsval *vp) JSAccessMode mode, jsval *vp)
{ {
@ -158,7 +158,7 @@ nsXBLDocGlobalObject_checkAccess(JSContext *cx, JSObject *obj, jsval id,
doCheckAccess(cx, obj, id, translated); doCheckAccess(cx, obj, id, translated);
} }
PR_STATIC_CALLBACK(void) static void
nsXBLDocGlobalObject_finalize(JSContext *cx, JSObject *obj) nsXBLDocGlobalObject_finalize(JSContext *cx, JSObject *obj)
{ {
nsISupports *nativeThis = (nsISupports*)JS_GetPrivate(cx, obj); nsISupports *nativeThis = (nsISupports*)JS_GetPrivate(cx, obj);
@ -172,7 +172,7 @@ nsXBLDocGlobalObject_finalize(JSContext *cx, JSObject *obj)
NS_RELEASE(nativeThis); NS_RELEASE(nativeThis);
} }
PR_STATIC_CALLBACK(JSBool) static JSBool
nsXBLDocGlobalObject_resolve(JSContext *cx, JSObject *obj, jsval id) nsXBLDocGlobalObject_resolve(JSContext *cx, JSObject *obj, jsval id)
{ {
JSBool did_resolve = JS_FALSE; JSBool did_resolve = JS_FALSE;
@ -434,7 +434,7 @@ static PRBool IsChromeURI(nsIURI* aURI)
/* Implementation file */ /* Implementation file */
static PRIntn PR_CALLBACK static PRIntn
TraverseProtos(nsHashKey *aKey, void *aData, void* aClosure) TraverseProtos(nsHashKey *aKey, void *aData, void* aClosure)
{ {
nsCycleCollectionTraversalCallback *cb = nsCycleCollectionTraversalCallback *cb =
@ -444,7 +444,7 @@ TraverseProtos(nsHashKey *aKey, void *aData, void* aClosure)
return kHashEnumerateNext; return kHashEnumerateNext;
} }
static PRIntn PR_CALLBACK static PRIntn
UnlinkProtoJSObjects(nsHashKey *aKey, void *aData, void* aClosure) UnlinkProtoJSObjects(nsHashKey *aKey, void *aData, void* aClosure)
{ {
nsXBLPrototypeBinding *proto = static_cast<nsXBLPrototypeBinding*>(aData); nsXBLPrototypeBinding *proto = static_cast<nsXBLPrototypeBinding*>(aData);
@ -458,7 +458,7 @@ struct ProtoTracer
void *mClosure; void *mClosure;
}; };
static PRIntn PR_CALLBACK static PRIntn
TraceProtos(nsHashKey *aKey, void *aData, void* aClosure) TraceProtos(nsHashKey *aKey, void *aData, void* aClosure)
{ {
ProtoTracer* closure = static_cast<ProtoTracer*>(aClosure); ProtoTracer* closure = static_cast<ProtoTracer*>(aClosure);
@ -557,7 +557,7 @@ nsXBLDocumentInfo::GetPrototypeBinding(const nsACString& aRef, nsXBLPrototypeBin
return NS_OK; return NS_OK;
} }
static PRBool PR_CALLBACK static PRBool
DeletePrototypeBinding(nsHashKey* aKey, void* aData, void* aClosure) DeletePrototypeBinding(nsHashKey* aKey, void* aData, void* aClosure)
{ {
nsXBLPrototypeBinding* binding = static_cast<nsXBLPrototypeBinding*>(aData); nsXBLPrototypeBinding* binding = static_cast<nsXBLPrototypeBinding*>(aData);
@ -592,7 +592,7 @@ nsXBLDocumentInfo::SetFirstPrototypeBinding(nsXBLPrototypeBinding* aBinding)
return NS_OK; return NS_OK;
} }
PRBool PR_CALLBACK FlushScopedSkinSheets(nsHashKey* aKey, void* aData, void* aClosure) PRBool FlushScopedSkinSheets(nsHashKey* aKey, void* aData, void* aClosure)
{ {
nsXBLPrototypeBinding* proto = (nsXBLPrototypeBinding*)aData; nsXBLPrototypeBinding* proto = (nsXBLPrototypeBinding*)aData;
proto->FlushSkinSheets(); proto->FlushSkinSheets();

16
content/xbl/src/nsXBLPrototypeBinding.cpp
View file

@ -332,7 +332,7 @@ nsXBLPrototypeBinding::Init(const nsACString& aID,
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(PRIntn) static PRIntn
TraverseInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure) TraverseInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure)
{ {
nsCycleCollectionTraversalCallback &cb = nsCycleCollectionTraversalCallback &cb =
@ -345,7 +345,7 @@ TraverseInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure)
return kHashEnumerateNext; return kHashEnumerateNext;
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
TraverseBinding(nsHashKey *aKey, void *aData, void* aClosure) TraverseBinding(nsHashKey *aKey, void *aData, void* aClosure)
{ {
nsCycleCollectionTraversalCallback *cb = nsCycleCollectionTraversalCallback *cb =
@ -646,7 +646,7 @@ struct InsertionData {
:mBinding(aBinding), mPrototype(aPrototype) {} :mBinding(aBinding), mPrototype(aPrototype) {}
}; };
PRBool PR_CALLBACK InstantiateInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure) PRBool InstantiateInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure)
{ {
nsXBLInsertionPointEntry* entry = static_cast<nsXBLInsertionPointEntry*>(aData); nsXBLInsertionPointEntry* entry = static_cast<nsXBLInsertionPointEntry*>(aData);
InsertionData* data = static_cast<InsertionData*>(aClosure); InsertionData* data = static_cast<InsertionData*>(aClosure);
@ -946,7 +946,7 @@ struct nsXBLAttrChangeData
}; };
// XXXbz this duplicates lots of AttributeChanged // XXXbz this duplicates lots of AttributeChanged
PRBool PR_CALLBACK SetAttrs(nsHashKey* aKey, void* aData, void* aClosure) PRBool SetAttrs(nsHashKey* aKey, void* aData, void* aClosure)
{ {
nsXBLAttributeEntry* entry = static_cast<nsXBLAttributeEntry*>(aData); nsXBLAttributeEntry* entry = static_cast<nsXBLAttributeEntry*>(aData);
nsXBLAttrChangeData* changeData = static_cast<nsXBLAttrChangeData*>(aClosure); nsXBLAttrChangeData* changeData = static_cast<nsXBLAttrChangeData*>(aClosure);
@ -1012,7 +1012,7 @@ PRBool PR_CALLBACK SetAttrs(nsHashKey* aKey, void* aData, void* aClosure)
return PR_TRUE; return PR_TRUE;
} }
PRBool PR_CALLBACK SetAttrsNS(nsHashKey* aKey, void* aData, void* aClosure) PRBool SetAttrsNS(nsHashKey* aKey, void* aData, void* aClosure)
{ {
if (aData && aClosure) { if (aData && aClosure) {
nsPRUint32Key * key = static_cast<nsPRUint32Key*>(aKey); nsPRUint32Key * key = static_cast<nsPRUint32Key*>(aKey);
@ -1072,14 +1072,14 @@ nsXBLPrototypeBinding::ShouldBuildChildFrames() const
return PR_TRUE; return PR_TRUE;
} }
static PRBool PR_CALLBACK static PRBool
DeleteAttributeEntry(nsHashKey* aKey, void* aData, void* aClosure) DeleteAttributeEntry(nsHashKey* aKey, void* aData, void* aClosure)
{ {
nsXBLAttributeEntry::Destroy(static_cast<nsXBLAttributeEntry*>(aData)); nsXBLAttributeEntry::Destroy(static_cast<nsXBLAttributeEntry*>(aData));
return PR_TRUE; return PR_TRUE;
} }
static PRBool PR_CALLBACK static PRBool
DeleteAttributeTable(nsHashKey* aKey, void* aData, void* aClosure) DeleteAttributeTable(nsHashKey* aKey, void* aData, void* aClosure)
{ {
delete static_cast<nsObjectHashtable*>(aData); delete static_cast<nsObjectHashtable*>(aData);
@ -1203,7 +1203,7 @@ nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement)
} }
} }
static PRBool PR_CALLBACK static PRBool
DeleteInsertionPointEntry(nsHashKey* aKey, void* aData, void* aClosure) DeleteInsertionPointEntry(nsHashKey* aKey, void* aData, void* aClosure)
{ {
static_cast<nsXBLInsertionPointEntry*>(aData)->Release(); static_cast<nsXBLInsertionPointEntry*>(aData)->Release();

12
content/xslt/src/xml/txXMLParser.cpp
View file

@ -158,42 +158,42 @@ txParseFromStream(istream& aInputStream, const nsAString& aUri,
} \ } \
PR_END_MACRO PR_END_MACRO
PR_STATIC_CALLBACK(void) static void
startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts) startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts)
{ {
TX_ENSURE_DATA(aUserData); TX_ENSURE_DATA(aUserData);
TX_XMLPARSER(aUserData)->StartElement(aName, aAtts); TX_XMLPARSER(aUserData)->StartElement(aName, aAtts);
} }
PR_STATIC_CALLBACK(void) static void
endElement(void *aUserData, const XML_Char* aName) endElement(void *aUserData, const XML_Char* aName)
{ {
TX_ENSURE_DATA(aUserData); TX_ENSURE_DATA(aUserData);
TX_XMLPARSER(aUserData)->EndElement(aName); TX_XMLPARSER(aUserData)->EndElement(aName);
} }
PR_STATIC_CALLBACK(void) static void
charData(void* aUserData, const XML_Char* aChars, int aLength) charData(void* aUserData, const XML_Char* aChars, int aLength)
{ {
TX_ENSURE_DATA(aUserData); TX_ENSURE_DATA(aUserData);
TX_XMLPARSER(aUserData)->CharacterData(aChars, aLength); TX_XMLPARSER(aUserData)->CharacterData(aChars, aLength);
} }
PR_STATIC_CALLBACK(void) static void
commentHandler(void* aUserData, const XML_Char* aChars) commentHandler(void* aUserData, const XML_Char* aChars)
{ {
TX_ENSURE_DATA(aUserData); TX_ENSURE_DATA(aUserData);
TX_XMLPARSER(aUserData)->Comment(aChars); TX_XMLPARSER(aUserData)->Comment(aChars);
} }
PR_STATIC_CALLBACK(void) static void
piHandler(void *aUserData, const XML_Char *aTarget, const XML_Char *aData) piHandler(void *aUserData, const XML_Char *aTarget, const XML_Char *aData)
{ {
TX_ENSURE_DATA(aUserData); TX_ENSURE_DATA(aUserData);
TX_XMLPARSER(aUserData)->ProcessingInstruction(aTarget, aData); TX_XMLPARSER(aUserData)->ProcessingInstruction(aTarget, aData);
} }
PR_STATIC_CALLBACK(int) static int
externalEntityRefHandler(XML_Parser aParser, externalEntityRefHandler(XML_Parser aParser,
const XML_Char *aContext, const XML_Char *aContext,
const XML_Char *aBase, const XML_Char *aBase,

4
content/xslt/src/xslt/txBufferingHandler.cpp
View file

@ -343,7 +343,7 @@ txBufferingHandler::startElement(nsIAtom* aPrefix,
return mBuffer->addTransaction(transaction); return mBuffer->addTransaction(transaction);
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
deleteTransaction(void* aElement, void *aData) deleteTransaction(void* aElement, void *aData)
{ {
delete static_cast<txOutputTransaction*>(aElement); delete static_cast<txOutputTransaction*>(aElement);
@ -371,7 +371,7 @@ struct Holder
nsAFlatString::const_char_iterator mIter; nsAFlatString::const_char_iterator mIter;
}; };
PR_STATIC_CALLBACK(PRBool) static PRBool
flushTransaction(void* aElement, void *aData) flushTransaction(void* aElement, void *aData)
{ {
Holder* holder = static_cast<Holder*>(aData); Holder* holder = static_cast<Holder*>(aData);

8
content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp
View file

@ -119,7 +119,7 @@ TX_CompileStylesheetPath(const txParsedURL& aURL, txStylesheet** aResult)
// shortcut macro for redirection into txDriver method calls // shortcut macro for redirection into txDriver method calls
#define TX_DRIVER(_userData) static_cast<txDriver*>(_userData) #define TX_DRIVER(_userData) static_cast<txDriver*>(_userData)
PR_STATIC_CALLBACK(void) static void
startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts) startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts)
{ {
if (!aUserData) { if (!aUserData) {
@ -129,7 +129,7 @@ startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts)
TX_DRIVER(aUserData)->StartElement(aName, aAtts); TX_DRIVER(aUserData)->StartElement(aName, aAtts);
} }
PR_STATIC_CALLBACK(void) static void
endElement(void *aUserData, const XML_Char* aName) endElement(void *aUserData, const XML_Char* aName)
{ {
if (!aUserData) { if (!aUserData) {
@ -139,7 +139,7 @@ endElement(void *aUserData, const XML_Char* aName)
TX_DRIVER(aUserData)->EndElement(aName); TX_DRIVER(aUserData)->EndElement(aName);
} }
PR_STATIC_CALLBACK(void) static void
charData(void* aUserData, const XML_Char* aChars, int aLength) charData(void* aUserData, const XML_Char* aChars, int aLength)
{ {
if (!aUserData) { if (!aUserData) {
@ -149,7 +149,7 @@ charData(void* aUserData, const XML_Char* aChars, int aLength)
TX_DRIVER(aUserData)->CharacterData(aChars, aLength); TX_DRIVER(aUserData)->CharacterData(aChars, aLength);
} }
PR_STATIC_CALLBACK(int) static int
externalEntityRefHandler(XML_Parser aParser, externalEntityRefHandler(XML_Parser aParser,
const XML_Char *aContext, const XML_Char *aContext,
const XML_Char *aBase, const XML_Char *aBase,

8
content/xul/document/src/nsXULDocument.cpp
View file

@ -306,7 +306,7 @@ NS_NewXULDocument(nsIXULDocument** result)
NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULDocument) NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULDocument)
static PLDHashOperator PR_CALLBACK static PLDHashOperator
TraverseTemplateBuilders(nsISupports* aKey, nsIXULTemplateBuilder* aData, TraverseTemplateBuilders(nsISupports* aKey, nsIXULTemplateBuilder* aData,
void* aContext) void* aContext)
{ {
@ -321,7 +321,7 @@ TraverseTemplateBuilders(nsISupports* aKey, nsIXULTemplateBuilder* aData,
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
static PLDHashOperator PR_CALLBACK static PLDHashOperator
TraverseObservers(nsIURI* aKey, nsIObserver* aData, void* aContext) TraverseObservers(nsIURI* aKey, nsIObserver* aData, void* aContext)
{ {
nsCycleCollectionTraversalCallback *cb = nsCycleCollectionTraversalCallback *cb =
@ -647,7 +647,7 @@ nsXULDocument::OnDocumentParserError()
return PR_TRUE; return PR_TRUE;
} }
PR_STATIC_CALLBACK(void) static void
ClearBroadcasterMapEntry(PLDHashTable* aTable, PLDHashEntryHdr* aEntry) ClearBroadcasterMapEntry(PLDHashTable* aTable, PLDHashEntryHdr* aEntry)
{ {
BroadcasterMapEntry* entry = BroadcasterMapEntry* entry =
@ -2791,7 +2791,7 @@ nsXULDocument::LoadOverlayInternal(nsIURI* aURI, PRBool aIsDynamic,
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
FirePendingMergeNotification(nsIURI* aKey, nsCOMPtr<nsIObserver>& aObserver, void* aClosure) FirePendingMergeNotification(nsIURI* aKey, nsCOMPtr<nsIObserver>& aObserver, void* aClosure)
{ {
aObserver->Observe(aKey, "xul-overlay-merged", EmptyString().get()); aObserver->Observe(aKey, "xul-overlay-merged", EmptyString().get());

12
content/xul/document/src/nsXULPrototypeCache.cpp
View file

@ -71,7 +71,7 @@ static const char kDisableXULCachePref[] = "nglayout.debug.disable_xul_cache";
//---------------------------------------------------------------------- //----------------------------------------------------------------------
PR_STATIC_CALLBACK(int) static int
DisableXULCacheChangedCallback(const char* aPref, void* aClosure) DisableXULCacheChangedCallback(const char* aPref, void* aClosure)
{ {
gDisableXULCache = gDisableXULCache =
@ -270,7 +270,7 @@ nsXULPrototypeCache::GetScript(nsIURI* aURI, PRUint32 *aLangID)
/* static */ /* static */
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
ReleaseScriptObjectCallback(nsIURI* aKey, CacheScriptEntry &aData, void* aClosure) ReleaseScriptObjectCallback(nsIURI* aKey, CacheScriptEntry &aData, void* aClosure)
{ {
nsCOMPtr<nsIScriptRuntime> rt; nsCOMPtr<nsIScriptRuntime> rt;
@ -328,7 +328,7 @@ nsXULPrototypeCache::PutXBLDocumentInfo(nsIXBLDocumentInfo* aDocumentInfo)
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
FlushSkinXBL(nsIURI* aKey, nsCOMPtr<nsIXBLDocumentInfo>& aDocInfo, void* aClosure) FlushSkinXBL(nsIURI* aKey, nsCOMPtr<nsIXBLDocumentInfo>& aDocInfo, void* aClosure)
{ {
nsCAutoString str; nsCAutoString str;
@ -343,7 +343,7 @@ FlushSkinXBL(nsIURI* aKey, nsCOMPtr<nsIXBLDocumentInfo>& aDocInfo, void* aClosur
return ret; return ret;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
FlushSkinSheets(nsIURI* aKey, nsCOMPtr<nsICSSStyleSheet>& aSheet, void* aClosure) FlushSkinSheets(nsIURI* aKey, nsCOMPtr<nsICSSStyleSheet>& aSheet, void* aClosure)
{ {
nsCOMPtr<nsIURI> uri; nsCOMPtr<nsIURI> uri;
@ -360,7 +360,7 @@ FlushSkinSheets(nsIURI* aKey, nsCOMPtr<nsICSSStyleSheet>& aSheet, void* aClosure
return ret; return ret;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
FlushScopedSkinStylesheets(nsIURI* aKey, nsCOMPtr<nsIXBLDocumentInfo> &aDocInfo, void* aClosure) FlushScopedSkinStylesheets(nsIURI* aKey, nsCOMPtr<nsIXBLDocumentInfo> &aDocInfo, void* aClosure)
{ {
aDocInfo->FlushSkinStylesheets(); aDocInfo->FlushSkinStylesheets();
@ -581,7 +581,7 @@ nsXULPrototypeCache::StartFastLoadingURI(nsIURI* aURI, PRInt32 aDirectionFlags)
return gFastLoadService->StartMuxedDocument(aURI, urlspec.get(), aDirectionFlags); return gFastLoadService->StartMuxedDocument(aURI, urlspec.get(), aDirectionFlags);
} }
PR_STATIC_CALLBACK(int) static int
FastLoadPrefChangedCallback(const char* aPref, void* aClosure) FastLoadPrefChangedCallback(const char* aPref, void* aClosure)
{ {
PRBool wasEnabled = !gDisableXULFastLoad; PRBool wasEnabled = !gDisableXULFastLoad;

4
content/xul/document/src/nsXULPrototypeDocument.cpp
View file

@ -115,7 +115,7 @@ nsXULPDGlobalObject* nsXULPrototypeDocument::gSystemGlobal;
PRUint32 nsXULPrototypeDocument::gRefCnt; PRUint32 nsXULPrototypeDocument::gRefCnt;
void PR_CALLBACK void
nsXULPDGlobalObject_finalize(JSContext *cx, JSObject *obj) nsXULPDGlobalObject_finalize(JSContext *cx, JSObject *obj)
{ {
nsISupports *nativeThis = (nsISupports*)JS_GetPrivate(cx, obj); nsISupports *nativeThis = (nsISupports*)JS_GetPrivate(cx, obj);
@ -131,7 +131,7 @@ nsXULPDGlobalObject_finalize(JSContext *cx, JSObject *obj)
} }
JSBool PR_CALLBACK JSBool
nsXULPDGlobalObject_resolve(JSContext *cx, JSObject *obj, jsval id) nsXULPDGlobalObject_resolve(JSContext *cx, JSObject *obj, jsval id)
{ {
JSBool did_resolve = JS_FALSE; JSBool did_resolve = JS_FALSE;

2
content/xul/templates/src/nsXULContentUtils.h
View file

@ -71,7 +71,7 @@ protected:
static PRBool gDisableXULCache; static PRBool gDisableXULCache;
static int PR_CALLBACK static int
DisableXULCacheChangedCallback(const char* aPrefName, void* aClosure); DisableXULCacheChangedCallback(const char* aPrefName, void* aClosure);
public: public:

2
content/xul/templates/src/nsXULSortService.cpp
View file

@ -223,7 +223,7 @@ XULSortServiceImpl::GetTemplateItemsToSort(nsIContent* aContainer,
return NS_OK; return NS_OK;
} }
int PR_CALLBACK int
testSortCallback(const void *data1, const void *data2, void *privateData) testSortCallback(const void *data1, const void *data2, void *privateData)
{ {
/// Note: testSortCallback is a small C callback stub for NS_QuickSort /// Note: testSortCallback is a small C callback stub for NS_QuickSort

6
content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
View file

@ -88,7 +88,7 @@ nsIRDFResource* nsXULTemplateQueryProcessorRDF::kRDF_type;
NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTemplateQueryProcessorRDF) NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTemplateQueryProcessorRDF)
NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsXULTemplateQueryProcessorRDF) NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsXULTemplateQueryProcessorRDF)
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
BindingDependenciesTraverser(nsISupports* key, BindingDependenciesTraverser(nsISupports* key,
nsCOMArray<nsXULTemplateResultRDF>* array, nsCOMArray<nsXULTemplateResultRDF>* array,
void* userArg) void* userArg)
@ -104,7 +104,7 @@ BindingDependenciesTraverser(nsISupports* key,
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
MemoryElementTraverser(const PRUint32& key, MemoryElementTraverser(const PRUint32& key,
nsCOMArray<nsXULTemplateResultRDF>* array, nsCOMArray<nsXULTemplateResultRDF>* array,
void* userArg) void* userArg)
@ -120,7 +120,7 @@ MemoryElementTraverser(const PRUint32& key,
return PL_DHASH_NEXT; return PL_DHASH_NEXT;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
RuleToBindingTraverser(nsISupports* key, RDFBindingSet* binding, void* userArg) RuleToBindingTraverser(nsISupports* key, RDFBindingSet* binding, void* userArg)
{ {
nsCycleCollectionTraversalCallback *cb = nsCycleCollectionTraversalCallback *cb =

2
content/xul/templates/src/nsXULTreeBuilder.cpp
View file

@ -179,7 +179,7 @@ protected:
/** /**
* A sorting callback for NS_QuickSort(). * A sorting callback for NS_QuickSort().
*/ */
static int PR_CALLBACK static int
Compare(const void* aLeft, const void* aRight, void* aClosure); Compare(const void* aLeft, const void* aRight, void* aClosure);
/** /**

4
db/morkreader/nsMorkReader.cpp
View file

@ -145,7 +145,7 @@ nsMorkReader::Init()
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
DeleteStringArray(const nsCSubstring& aKey, DeleteStringArray(const nsCSubstring& aKey,
nsTArray<nsCString> *aData, nsTArray<nsCString> *aData,
void *aUserArg) void *aUserArg)
@ -170,7 +170,7 @@ struct AddColumnClosure
nsresult result; nsresult result;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
AddColumn(const nsCSubstring &id, nsCString name, void *userData) AddColumn(const nsCSubstring &id, nsCString name, void *userData)
{ {
AddColumnClosure *closure = static_cast<AddColumnClosure*>(userData); AddColumnClosure *closure = static_cast<AddColumnClosure*>(userData);

2
db/morkreader/nsMorkReader.h
View file

@ -128,7 +128,7 @@ class NS_STACK_CLASS nsMorkReader
// The callback can return PL_DHASH_NEXT to continue enumerating, // The callback can return PL_DHASH_NEXT to continue enumerating,
// or PL_DHASH_STOP to stop. // or PL_DHASH_STOP to stop.
typedef PLDHashOperator typedef PLDHashOperator
(*PR_CALLBACK RowEnumerator)(const nsCSubstring &rowID, (* RowEnumerator)(const nsCSubstring &rowID,
const nsTArray<nsCString> *values, const nsTArray<nsCString> *values,
void *userData); void *userData);

2
docshell/base/nsWebShell.cpp
View file

@ -634,7 +634,7 @@ nsWebShell::GetInterface(const nsIID &aIID, void** aInstancePtr)
return nsDocShell::GetInterface(aIID, aInstancePtr); return nsDocShell::GetInterface(aIID, aInstancePtr);
} }
nsEventStatus PR_CALLBACK nsEventStatus
nsWebShell::HandleEvent(nsGUIEvent *aEvent) nsWebShell::HandleEvent(nsGUIEvent *aEvent)
{ {
return nsEventStatus_eIgnore; return nsEventStatus_eIgnore;

2
docshell/base/nsWebShell.h
View file

@ -100,7 +100,7 @@ public:
NS_IMETHOD Create(); NS_IMETHOD Create();
static nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent); static nsEventStatus HandleEvent(nsGUIEvent *aEvent);
// NS_IMETHOD SetURL(const PRUnichar* aURL); // NS_IMETHOD SetURL(const PRUnichar* aURL);

4
docshell/build/nsDocShellModule.cpp
View file

@ -76,7 +76,7 @@ static PRBool gInitialized = PR_FALSE;
// The one time initialization for this module // The one time initialization for this module
// static // static
PR_STATIC_CALLBACK(nsresult) static nsresult
Initialize(nsIModule* aSelf) Initialize(nsIModule* aSelf)
{ {
NS_PRECONDITION(!gInitialized, "docshell module already initialized"); NS_PRECONDITION(!gInitialized, "docshell module already initialized");
@ -92,7 +92,7 @@ Initialize(nsIModule* aSelf)
return rv; return rv;
} }
PR_STATIC_CALLBACK(void) static void
Shutdown(nsIModule* aSelf) Shutdown(nsIModule* aSelf)
{ {
nsSHEntry::Shutdown(); nsSHEntry::Shutdown();

2
docshell/shistory/src/nsSHEntry.cpp
View file

@ -139,7 +139,7 @@ nsSHEntry::nsSHEntry(const nsSHEntry &other)
{ {
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
ClearParentPtr(nsISHEntry* aEntry, void* /* aData */) ClearParentPtr(nsISHEntry* aEntry, void* /* aData */)
{ {
if (aEntry) { if (aEntry) {

4
dom/src/base/nsGlobalWindow.cpp
View file

@ -1067,7 +1067,7 @@ struct TraceData
void* closure; void* closure;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
TraceXBLHandlers(const void* aKey, void* aData, void* aClosure) TraceXBLHandlers(const void* aKey, void* aData, void* aClosure)
{ {
TraceData* data = static_cast<TraceData*>(aClosure); TraceData* data = static_cast<TraceData*>(aClosure);
@ -6932,7 +6932,7 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic,
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
FirePendingStorageEvents(const nsAString& aKey, PRBool aData, void *userArg) FirePendingStorageEvents(const nsAString& aKey, PRBool aData, void *userArg)
{ {
nsGlobalWindow *win = static_cast<nsGlobalWindow *>(userArg); nsGlobalWindow *win = static_cast<nsGlobalWindow *>(userArg);

6
dom/src/base/nsJSEnvironment.cpp
View file

@ -1135,7 +1135,7 @@ static const char js_zeal_option_str[] = JS_OPTIONS_DOT_STR "gczeal";
static const char js_jit_content_str[] = JS_OPTIONS_DOT_STR "jit.content"; static const char js_jit_content_str[] = JS_OPTIONS_DOT_STR "jit.content";
static const char js_jit_chrome_str[] = JS_OPTIONS_DOT_STR "jit.chrome"; static const char js_jit_chrome_str[] = JS_OPTIONS_DOT_STR "jit.chrome";
int PR_CALLBACK int
nsJSContext::JSOptionChangedCallback(const char *pref, void *data) nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
{ {
nsJSContext *context = reinterpret_cast<nsJSContext *>(data); nsJSContext *context = reinterpret_cast<nsJSContext *>(data);
@ -3699,7 +3699,7 @@ nsJSRuntime::Startup()
gCollation = nsnull; gCollation = nsnull;
} }
static int PR_CALLBACK static int
MaxScriptRunTimePrefChangedCallback(const char *aPrefName, void *aClosure) MaxScriptRunTimePrefChangedCallback(const char *aPrefName, void *aClosure)
{ {
// Default limit on script run time to 10 seconds. 0 means let // Default limit on script run time to 10 seconds. 0 means let
@ -3725,7 +3725,7 @@ MaxScriptRunTimePrefChangedCallback(const char *aPrefName, void *aClosure)
return 0; return 0;
} }
static int PR_CALLBACK static int
ReportAllJSExceptionsPrefChangedCallback(const char* aPrefName, void* aClosure) ReportAllJSExceptionsPrefChangedCallback(const char* aPrefName, void* aClosure)
{ {
PRBool reportAll = nsContentUtils::GetBoolPref(aPrefName, PR_FALSE); PRBool reportAll = nsContentUtils::GetBoolPref(aPrefName, PR_FALSE);

2
dom/src/base/nsJSEnvironment.h
View file

@ -292,7 +292,7 @@ private:
nsCOMPtr<nsISupports> mGlobalWrapperRef; nsCOMPtr<nsISupports> mGlobalWrapperRef;
static int PR_CALLBACK JSOptionChangedCallback(const char *pref, void *data); static int JSOptionChangedCallback(const char *pref, void *data);
static JSBool DOMOperationCallback(JSContext *cx); static JSBool DOMOperationCallback(JSContext *cx);
}; };

10
dom/src/base/nsScriptNameSpaceManager.cpp
View file

@ -68,7 +68,7 @@ public:
}; };
PR_STATIC_CALLBACK(PLDHashNumber) static PLDHashNumber
GlobalNameHashHashKey(PLDHashTable *table, const void *key) GlobalNameHashHashKey(PLDHashTable *table, const void *key)
{ {
const nsAString *str = static_cast<const nsAString *>(key); const nsAString *str = static_cast<const nsAString *>(key);
@ -76,7 +76,7 @@ GlobalNameHashHashKey(PLDHashTable *table, const void *key)
return HashString(*str); return HashString(*str);
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry, GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,
const void *key) const void *key)
{ {
@ -87,7 +87,7 @@ GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,
return str->Equals(e->mKey); return str->Equals(e->mKey);
} }
PR_STATIC_CALLBACK(void) static void
GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry) GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
{ {
GlobalNameMapEntry *e = static_cast<GlobalNameMapEntry *>(entry); GlobalNameMapEntry *e = static_cast<GlobalNameMapEntry *>(entry);
@ -116,7 +116,7 @@ GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
memset(&e->mGlobalName, 0, sizeof(nsGlobalNameStruct)); memset(&e->mGlobalName, 0, sizeof(nsGlobalNameStruct));
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
GlobalNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, GlobalNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,
const void *key) const void *key)
{ {
@ -510,7 +510,7 @@ struct NameSetClosure {
nsresult rv; nsresult rv;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
NameSetInitCallback(PLDHashTable *table, PLDHashEntryHdr *hdr, NameSetInitCallback(PLDHashTable *table, PLDHashEntryHdr *hdr,
PRUint32 number, void *arg) PRUint32 number, void *arg)
{ {

14
dom/src/storage/nsDOMStorage.cpp
View file

@ -228,7 +228,7 @@ nsDOMStorageManager::Shutdown()
#endif #endif
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
ClearStorage(nsDOMStorageEntry* aEntry, void* userArg) ClearStorage(nsDOMStorageEntry* aEntry, void* userArg)
{ {
aEntry->mStorage->ClearAll(); aEntry->mStorage->ClearAll();
@ -364,7 +364,7 @@ nsDOMStorageEntry::~nsDOMStorageEntry()
{ {
} }
PLDHashOperator PR_CALLBACK PLDHashOperator
SessionStorageTraverser(nsSessionStorageEntry* aEntry, void* userArg) { SessionStorageTraverser(nsSessionStorageEntry* aEntry, void* userArg) {
nsCycleCollectionTraversalCallback *cb = nsCycleCollectionTraversalCallback *cb =
static_cast<nsCycleCollectionTraversalCallback*>(userArg); static_cast<nsCycleCollectionTraversalCallback*>(userArg);
@ -510,7 +510,7 @@ private:
ItemCounterState(); // Not to be implemented ItemCounterState(); // Not to be implemented
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
ItemCounter(nsSessionStorageEntry* aEntry, void* userArg) ItemCounter(nsSessionStorageEntry* aEntry, void* userArg)
{ {
ItemCounterState *state = (ItemCounterState *)userArg; ItemCounterState *state = (ItemCounterState *)userArg;
@ -558,7 +558,7 @@ private:
IndexFinderData(); // Not to be implemented IndexFinderData(); // Not to be implemented
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
IndexFinder(nsSessionStorageEntry* aEntry, void* userArg) IndexFinder(nsSessionStorageEntry* aEntry, void* userArg)
{ {
IndexFinderData *data = (IndexFinderData *)userArg; IndexFinderData *data = (IndexFinderData *)userArg;
@ -931,7 +931,7 @@ nsDOMStorage::SetSecure(const nsAString& aKey, PRBool aSecure)
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
ClearStorageItem(nsSessionStorageEntry* aEntry, void* userArg) ClearStorageItem(nsSessionStorageEntry* aEntry, void* userArg)
{ {
aEntry->mItem->SetValueInternal(EmptyString()); aEntry->mItem->SetValueInternal(EmptyString());
@ -944,7 +944,7 @@ nsDOMStorage::ClearAll()
mItems.EnumerateEntries(ClearStorageItem, nsnull); mItems.EnumerateEntries(ClearStorageItem, nsnull);
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
CopyStorageItems(nsSessionStorageEntry* aEntry, void* userArg) CopyStorageItems(nsSessionStorageEntry* aEntry, void* userArg)
{ {
nsDOMStorage* newstorage = static_cast<nsDOMStorage*>(userArg); nsDOMStorage* newstorage = static_cast<nsDOMStorage*>(userArg);
@ -984,7 +984,7 @@ struct KeysArrayBuilderStruct
nsTArray<nsString> *keys; nsTArray<nsString> *keys;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
KeysArrayBuilder(nsSessionStorageEntry* aEntry, void* userArg) KeysArrayBuilder(nsSessionStorageEntry* aEntry, void* userArg)
{ {
KeysArrayBuilderStruct *keystruct = (KeysArrayBuilderStruct *)userArg; KeysArrayBuilderStruct *keystruct = (KeysArrayBuilderStruct *)userArg;

4
embedding/browser/activex/src/common/IEHtmlNode.cpp
View file

@ -43,12 +43,12 @@
static PLHashTable *g_NodeLookupTable; static PLHashTable *g_NodeLookupTable;
static PLHashNumber PR_CALLBACK HashFunction(const void *key) static PLHashNumber HashFunction(const void *key)
{ {
return (PRUint32) key; return (PRUint32) key;
} }
PRIntn PR_CALLBACK HashComparator(const void *v1, const void *v2) PRIntn HashComparator(const void *v1, const void *v2)
{ {
if (v1 == v2) if (v1 == v2)
{ {

2
embedding/browser/activex/src/plugin/XPConnect.cpp
View file

@ -376,7 +376,7 @@ nsScriptablePeer::ConvertVariants(VARIANT *aIn, nsIVariant **aOut)
if (hlib) if (hlib)
{ {
nsIComponentManager *pManager = nsnull; // A frozen interface, even in 1.0.x nsIComponentManager *pManager = nsnull; // A frozen interface, even in 1.0.x
typedef nsresult (PR_CALLBACK *Moz1XGetComponentManagerFunc)(nsIComponentManager* *result); typedef nsresult (*Moz1XGetComponentManagerFunc)(nsIComponentManager* *result);
Moz1XGetComponentManagerFunc compMgr = (Moz1XGetComponentManagerFunc) Moz1XGetComponentManagerFunc compMgr = (Moz1XGetComponentManagerFunc)
::GetProcAddress(hlib, "NS_GetComponentManager"); ::GetProcAddress(hlib, "NS_GetComponentManager");
if (compMgr) if (compMgr)

2
embedding/browser/photon/src/PtMozilla.cpp
View file

@ -94,7 +94,7 @@
#ifdef _BUILD_STATIC_BIN #ifdef _BUILD_STATIC_BIN
#include "nsStaticComponent.h" #include "nsStaticComponent.h"
nsresult PR_CALLBACK nsresult
ph_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); ph_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
#endif #endif

4
embedding/browser/webBrowser/nsWebBrowser.cpp
View file

@ -123,7 +123,7 @@ nsWebBrowser::~nsWebBrowser()
InternalDestroy(); InternalDestroy();
} }
PRBool PR_CALLBACK deleteListener(void *aElement, void *aData) { PRBool deleteListener(void *aElement, void *aData) {
nsWebBrowserListenerState *state = (nsWebBrowserListenerState*)aElement; nsWebBrowserListenerState *state = (nsWebBrowserListenerState*)aElement;
NS_DELETEXPCOM(state); NS_DELETEXPCOM(state);
return PR_TRUE; return PR_TRUE;
@ -1647,7 +1647,7 @@ NS_IMETHODIMP nsWebBrowser::EnsureDocShellTreeOwner()
} }
/* static */ /* static */
nsEventStatus PR_CALLBACK nsWebBrowser::HandleEvent(nsGUIEvent *aEvent) nsEventStatus nsWebBrowser::HandleEvent(nsGUIEvent *aEvent)
{ {
nsWebBrowser *browser = nsnull; nsWebBrowser *browser = nsnull;
void *data = nsnull; void *data = nsnull;

2
embedding/browser/webBrowser/nsWebBrowser.h
View file

@ -151,7 +151,7 @@ protected:
NS_IMETHOD UnBindListener(nsISupports *aListener, const nsIID& aIID); NS_IMETHOD UnBindListener(nsISupports *aListener, const nsIID& aIID);
NS_IMETHOD EnableGlobalHistory(PRBool aEnable); NS_IMETHOD EnableGlobalHistory(PRBool aEnable);
static nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent); static nsEventStatus HandleEvent(nsGUIEvent *aEvent);
protected: protected:
nsDocShellTreeOwner* mDocShellTreeOwner; nsDocShellTreeOwner* mDocShellTreeOwner;

2
embedding/components/commandhandler/src/nsCommandGroup.cpp
View file

@ -59,7 +59,7 @@ public:
protected: protected:
static PRBool PR_CALLBACK HashEnum(nsHashKey *aKey, void *aData, void* aClosure); static PRBool HashEnum(nsHashKey *aKey, void *aData, void* aClosure);
nsresult Initialize(); nsresult Initialize();

2
embedding/components/commandhandler/src/nsCommandGroup.h
View file

@ -70,7 +70,7 @@ protected:
protected: protected:
static PRBool PR_CALLBACK ClearEnumerator(nsHashKey *aKey, void *aData, void* closure); static PRBool ClearEnumerator(nsHashKey *aKey, void *aData, void* closure);
protected: protected:

2
embedding/components/commandhandler/src/nsCommandManager.cpp
View file

@ -70,7 +70,7 @@ nsCommandManager::~nsCommandManager()
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
TraverseCommandObservers(const char* aKey, nsCOMArray<nsIObserver>* aObservers, TraverseCommandObservers(const char* aKey, nsCOMArray<nsIObserver>* aObservers,
void* aClosure) void* aClosure)
{ {

8
embedding/components/commandhandler/src/nsCommandParams.h
View file

@ -151,15 +151,15 @@ protected:
protected: protected:
static PLDHashNumber PR_CALLBACK HashKey(PLDHashTable *table, const void *key); static PLDHashNumber HashKey(PLDHashTable *table, const void *key);
static PRBool PR_CALLBACK HashMatchEntry(PLDHashTable *table, static PRBool HashMatchEntry(PLDHashTable *table,
const PLDHashEntryHdr *entry, const void *key); const PLDHashEntryHdr *entry, const void *key);
static void PR_CALLBACK HashMoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from, static void HashMoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from,
PLDHashEntryHdr *to); PLDHashEntryHdr *to);
static void PR_CALLBACK HashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry); static void HashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry);
protected: protected:

16
embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
View file

@ -2404,7 +2404,7 @@ nsWebBrowserPersist::FixRedirectedChannelEntry(nsIChannel *aNewChannel)
return NS_OK; return NS_OK;
} }
PRBool PR_CALLBACK PRBool
nsWebBrowserPersist::EnumFixRedirect(nsHashKey *aKey, void *aData, void* closure) nsWebBrowserPersist::EnumFixRedirect(nsHashKey *aKey, void *aData, void* closure)
{ {
FixRedirectData *data = (FixRedirectData *) closure; FixRedirectData *data = (FixRedirectData *) closure;
@ -2456,7 +2456,7 @@ nsWebBrowserPersist::CalcTotalProgress()
} }
} }
PRBool PR_CALLBACK PRBool
nsWebBrowserPersist::EnumCalcProgress(nsHashKey *aKey, void *aData, void* closure) nsWebBrowserPersist::EnumCalcProgress(nsHashKey *aKey, void *aData, void* closure)
{ {
nsWebBrowserPersist *pthis = (nsWebBrowserPersist *) closure; nsWebBrowserPersist *pthis = (nsWebBrowserPersist *) closure;
@ -2472,7 +2472,7 @@ nsWebBrowserPersist::EnumCalcProgress(nsHashKey *aKey, void *aData, void* closur
return PR_TRUE; return PR_TRUE;
} }
PRBool PR_CALLBACK PRBool
nsWebBrowserPersist::EnumCalcUploadProgress(nsHashKey *aKey, void *aData, void* closure) nsWebBrowserPersist::EnumCalcUploadProgress(nsHashKey *aKey, void *aData, void* closure)
{ {
if (aData && closure) if (aData && closure)
@ -2485,7 +2485,7 @@ nsWebBrowserPersist::EnumCalcUploadProgress(nsHashKey *aKey, void *aData, void*
return PR_TRUE; return PR_TRUE;
} }
PRBool PR_CALLBACK PRBool
nsWebBrowserPersist::EnumCountURIsToPersist(nsHashKey *aKey, void *aData, void* closure) nsWebBrowserPersist::EnumCountURIsToPersist(nsHashKey *aKey, void *aData, void* closure)
{ {
URIData *data = (URIData *) aData; URIData *data = (URIData *) aData;
@ -2497,7 +2497,7 @@ nsWebBrowserPersist::EnumCountURIsToPersist(nsHashKey *aKey, void *aData, void*
return PR_TRUE; return PR_TRUE;
} }
PRBool PR_CALLBACK PRBool
nsWebBrowserPersist::EnumPersistURIs(nsHashKey *aKey, void *aData, void* closure) nsWebBrowserPersist::EnumPersistURIs(nsHashKey *aKey, void *aData, void* closure)
{ {
URIData *data = (URIData *) aData; URIData *data = (URIData *) aData;
@ -2548,7 +2548,7 @@ nsWebBrowserPersist::EnumPersistURIs(nsHashKey *aKey, void *aData, void* closure
return PR_TRUE; return PR_TRUE;
} }
PRBool PR_CALLBACK PRBool
nsWebBrowserPersist::EnumCleanupOutputMap(nsHashKey *aKey, void *aData, void* closure) nsWebBrowserPersist::EnumCleanupOutputMap(nsHashKey *aKey, void *aData, void* closure)
{ {
nsCOMPtr<nsISupports> keyPtr; nsCOMPtr<nsISupports> keyPtr;
@ -2567,7 +2567,7 @@ nsWebBrowserPersist::EnumCleanupOutputMap(nsHashKey *aKey, void *aData, void* cl
} }
PRBool PR_CALLBACK PRBool
nsWebBrowserPersist::EnumCleanupURIMap(nsHashKey *aKey, void *aData, void* closure) nsWebBrowserPersist::EnumCleanupURIMap(nsHashKey *aKey, void *aData, void* closure)
{ {
URIData *data = (URIData *) aData; URIData *data = (URIData *) aData;
@ -2579,7 +2579,7 @@ nsWebBrowserPersist::EnumCleanupURIMap(nsHashKey *aKey, void *aData, void* closu
} }
PRBool PR_CALLBACK PRBool
nsWebBrowserPersist::EnumCleanupUploadList(nsHashKey *aKey, void *aData, void* closure) nsWebBrowserPersist::EnumCleanupUploadList(nsHashKey *aKey, void *aData, void* closure)
{ {
nsCOMPtr<nsISupports> keyPtr; nsCOMPtr<nsISupports> keyPtr;

16
embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h
View file

@ -186,21 +186,21 @@ private:
void SetApplyConversionIfNeeded(nsIChannel *aChannel); void SetApplyConversionIfNeeded(nsIChannel *aChannel);
// Hash table enumerators // Hash table enumerators
static PRBool PR_CALLBACK EnumPersistURIs( static PRBool EnumPersistURIs(
nsHashKey *aKey, void *aData, void* closure); nsHashKey *aKey, void *aData, void* closure);
static PRBool PR_CALLBACK EnumCleanupURIMap( static PRBool EnumCleanupURIMap(
nsHashKey *aKey, void *aData, void* closure); nsHashKey *aKey, void *aData, void* closure);
static PRBool PR_CALLBACK EnumCleanupOutputMap( static PRBool EnumCleanupOutputMap(
nsHashKey *aKey, void *aData, void* closure); nsHashKey *aKey, void *aData, void* closure);
static PRBool PR_CALLBACK EnumCleanupUploadList( static PRBool EnumCleanupUploadList(
nsHashKey *aKey, void *aData, void* closure); nsHashKey *aKey, void *aData, void* closure);
static PRBool PR_CALLBACK EnumCalcProgress( static PRBool EnumCalcProgress(
nsHashKey *aKey, void *aData, void* closure); nsHashKey *aKey, void *aData, void* closure);
static PRBool PR_CALLBACK EnumCalcUploadProgress( static PRBool EnumCalcUploadProgress(
nsHashKey *aKey, void *aData, void* closure); nsHashKey *aKey, void *aData, void* closure);
static PRBool PR_CALLBACK EnumFixRedirect( static PRBool EnumFixRedirect(
nsHashKey *aKey, void *aData, void* closure); nsHashKey *aKey, void *aData, void* closure);
static PRBool PR_CALLBACK EnumCountURIsToPersist( static PRBool EnumCountURIsToPersist(
nsHashKey *aKey, void *aData, void* closure); nsHashKey *aKey, void *aData, void* closure);
nsCOMPtr<nsIURI> mCurrentDataPath; nsCOMPtr<nsIURI> mCurrentDataPath;

2
extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp
View file

@ -73,7 +73,7 @@ static NS_METHOD nsAccessProxyRegistrationProc(nsIComponentManager *aCompMgr,
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsAccessProxy,nsAccessProxy::GetInstance) NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsAccessProxy,nsAccessProxy::GetInstance)
static void PR_CALLBACK AccessProxyModuleDtor(nsIModule* self) static void AccessProxyModuleDtor(nsIModule* self)
{ {
nsAccessProxy::ReleaseInstance(); nsAccessProxy::ReleaseInstance();
} }

4
extensions/auth/nsAuthFactory.cpp
View file

@ -260,7 +260,7 @@ static nsModuleComponentInfo components[] = {
PRLogModuleInfo *gNegotiateLog; PRLogModuleInfo *gNegotiateLog;
// setup nspr logging ... // setup nspr logging ...
PR_STATIC_CALLBACK(nsresult) static nsresult
InitNegotiateAuth(nsIModule *self) InitNegotiateAuth(nsIModule *self)
{ {
gNegotiateLog = PR_NewLogModule("negotiateauth"); gNegotiateLog = PR_NewLogModule("negotiateauth");
@ -270,7 +270,7 @@ InitNegotiateAuth(nsIModule *self)
#define InitNegotiateAuth nsnull #define InitNegotiateAuth nsnull
#endif #endif
PR_STATIC_CALLBACK(void) static void
DestroyNegotiateAuth(nsIModule *self) DestroyNegotiateAuth(nsIModule *self)
{ {
nsAuthGSSAPI::Shutdown(); nsAuthGSSAPI::Shutdown();

2
extensions/cookie/nsPermissionManager.cpp
View file

@ -546,7 +546,7 @@ struct nsGetEnumeratorData
const nsTArray<nsCString> *types; const nsTArray<nsCString> *types;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
AddPermissionsToList(nsHostEntry *entry, void *arg) AddPermissionsToList(nsHostEntry *entry, void *arg)
{ {
nsGetEnumeratorData *data = static_cast<nsGetEnumeratorData *>(arg); nsGetEnumeratorData *data = static_cast<nsGetEnumeratorData *>(arg);

2
extensions/metrics/src/nsLoadCollector.cpp
View file

@ -450,7 +450,7 @@ nsLoadCollector::OnAttach()
return NS_OK; return NS_OK;
} }
/* static */ PLDHashOperator PR_CALLBACK /* static */ PLDHashOperator
nsLoadCollector::RemoveDocumentFromMap(const nsIDocument *document, nsLoadCollector::RemoveDocumentFromMap(const nsIDocument *document,
DocumentEntry &entry, void *userData) DocumentEntry &entry, void *userData)
{ {

2
extensions/metrics/src/nsLoadCollector.h
View file

@ -102,7 +102,7 @@ class nsLoadCollector : public nsIMetricsCollector,
~nsLoadCollector(); ~nsLoadCollector();
// Callback for removing a document observer and map entry // Callback for removing a document observer and map entry
static PLDHashOperator PR_CALLBACK static PLDHashOperator
RemoveDocumentFromMap(const nsIDocument *document, RemoveDocumentFromMap(const nsIDocument *document,
DocumentEntry &entry, void *userData); DocumentEntry &entry, void *userData);

2
extensions/metrics/src/nsMetricsConfig.cpp
View file

@ -414,7 +414,7 @@ nsMetricsConfig::ClearEvents()
mEventSet.Clear(); mEventSet.Clear();
} }
/* static */ PLDHashOperator PR_CALLBACK /* static */ PLDHashOperator
nsMetricsConfig::CopyKey(nsStringHashKey *entry, void *userData) nsMetricsConfig::CopyKey(nsStringHashKey *entry, void *userData)
{ {
static_cast<nsTArray<nsString> *>(userData)-> static_cast<nsTArray<nsString> *>(userData)->

3
extensions/metrics/src/nsMetricsConfig.h
View file

@ -152,8 +152,7 @@ private:
void ProcessConfigChild(nsIDOMElement *elem); void ProcessConfigChild(nsIDOMElement *elem);
void ProcessCollectorElement(nsIDOMElement *elem); void ProcessCollectorElement(nsIDOMElement *elem);
static PLDHashOperator PR_CALLBACK CopyKey(nsStringHashKey *key, static PLDHashOperator CopyKey(nsStringHashKey *key, void *userData);
void *userData);
nsTHashtable<nsStringHashKey> mEventSet; nsTHashtable<nsStringHashKey> mEventSet;
nsDataHashtable<nsStringHashKey,nsString> mNSURIToPrefixMap; nsDataHashtable<nsStringHashKey,nsString> mNSURIToPrefixMap;

6
extensions/metrics/src/nsMetricsService.cpp
View file

@ -204,7 +204,7 @@ nsMetricsService::nsMetricsService()
sMetricsService = this; sMetricsService = this;
} }
/* static */ PLDHashOperator PR_CALLBACK /* static */ PLDHashOperator
nsMetricsService::DetachCollector(const nsAString &key, nsMetricsService::DetachCollector(const nsAString &key,
nsIMetricsCollector *value, void *userData) nsIMetricsCollector *value, void *userData)
{ {
@ -773,7 +773,7 @@ struct DisabledCollectorsClosure
nsTArray< nsCOMPtr<nsIMetricsCollector> > disabledCollectors; nsTArray< nsCOMPtr<nsIMetricsCollector> > disabledCollectors;
}; };
/* static */ PLDHashOperator PR_CALLBACK /* static */ PLDHashOperator
nsMetricsService::PruneDisabledCollectors(const nsAString &key, nsMetricsService::PruneDisabledCollectors(const nsAString &key,
nsCOMPtr<nsIMetricsCollector> &value, nsCOMPtr<nsIMetricsCollector> &value,
void *userData) void *userData)
@ -797,7 +797,7 @@ nsMetricsService::PruneDisabledCollectors(const nsAString &key,
return PL_DHASH_REMOVE; return PL_DHASH_REMOVE;
} }
/* static */ PLDHashOperator PR_CALLBACK /* static */ PLDHashOperator
nsMetricsService::NotifyNewLog(const nsAString &key, nsMetricsService::NotifyNewLog(const nsAString &key,
nsIMetricsCollector *value, void *userData) nsIMetricsCollector *value, void *userData)
{ {

6
extensions/metrics/src/nsMetricsService.h
View file

@ -220,16 +220,16 @@ private:
// Generates a random interval, in seconds, between 12 and 36 hours. // Generates a random interval, in seconds, between 12 and 36 hours.
PRInt32 GetRandomUploadInterval(); PRInt32 GetRandomUploadInterval();
static PLDHashOperator PR_CALLBACK static PLDHashOperator
PruneDisabledCollectors(const nsAString &key, PruneDisabledCollectors(const nsAString &key,
nsCOMPtr<nsIMetricsCollector> &value, nsCOMPtr<nsIMetricsCollector> &value,
void *userData); void *userData);
static PLDHashOperator PR_CALLBACK static PLDHashOperator
DetachCollector(const nsAString &key, DetachCollector(const nsAString &key,
nsIMetricsCollector *value, void *userData); nsIMetricsCollector *value, void *userData);
static PLDHashOperator PR_CALLBACK static PLDHashOperator
NotifyNewLog(const nsAString &key, NotifyNewLog(const nsAString &key,
nsIMetricsCollector *value, void *userData); nsIMetricsCollector *value, void *userData);

4
extensions/metrics/src/nsUICommandCollector.cpp
View file

@ -60,7 +60,7 @@ NS_IMPL_ISUPPORTS3(nsUICommandCollector, nsIObserver, nsIDOMEventListener,
nsIMetricsCollector) nsIMetricsCollector)
/* static */ /* static */
PLDHashOperator PR_CALLBACK nsUICommandCollector::AddCommandEventListener( PLDHashOperator nsUICommandCollector::AddCommandEventListener(
const nsIDOMWindow* key, PRUint32 windowID, void* userArg) const nsIDOMWindow* key, PRUint32 windowID, void* userArg)
{ {
nsCOMPtr<nsIDOMEventTarget> windowTarget = nsCOMPtr<nsIDOMEventTarget> windowTarget =
@ -77,7 +77,7 @@ const nsIDOMWindow* key, PRUint32 windowID, void* userArg)
} }
/* static */ /* static */
PLDHashOperator PR_CALLBACK nsUICommandCollector::RemoveCommandEventListener( PLDHashOperator nsUICommandCollector::RemoveCommandEventListener(
const nsIDOMWindow* key, PRUint32 windowID, void* userArg) const nsIDOMWindow* key, PRUint32 windowID, void* userArg)
{ {
nsCOMPtr<nsIDOMEventTarget> windowTarget = nsCOMPtr<nsIDOMEventTarget> windowTarget =

4
extensions/metrics/src/nsUICommandCollector.h
View file

@ -60,10 +60,10 @@ class nsUICommandCollector : public nsIObserver,
NS_DECL_NSIDOMEVENTLISTENER NS_DECL_NSIDOMEVENTLISTENER
NS_DECL_NSIMETRICSCOLLECTOR NS_DECL_NSIMETRICSCOLLECTOR
static PLDHashOperator PR_CALLBACK AddCommandEventListener( static PLDHashOperator AddCommandEventListener(
const nsIDOMWindow* key, PRUint32 windowID, void* userArg); const nsIDOMWindow* key, PRUint32 windowID, void* userArg);
static PLDHashOperator PR_CALLBACK RemoveCommandEventListener( static PLDHashOperator RemoveCommandEventListener(
const nsIDOMWindow* key, PRUint32 windowID, void* userArg); const nsIDOMWindow* key, PRUint32 windowID, void* userArg);
nsUICommandCollector(); nsUICommandCollector();

4
extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
View file

@ -209,7 +209,7 @@ struct SysPrefCallbackData {
PRUint32 prefAtom; PRUint32 prefAtom;
}; };
PRBool PR_CALLBACK PRBool
sysPrefDeleteObserver(void *aElement, void *aData) { sysPrefDeleteObserver(void *aElement, void *aData) {
SysPrefCallbackData *pElement = SysPrefCallbackData *pElement =
static_cast<SysPrefCallbackData *>(aElement); static_cast<SysPrefCallbackData *>(aElement);
@ -586,7 +586,7 @@ static const PrefNamePair sPrefNameMapping[] = {
{nsnull, nsnull}, {nsnull, nsnull},
}; };
PRBool PR_CALLBACK PRBool
gconfDeleteObserver(void *aElement, void *aData) { gconfDeleteObserver(void *aElement, void *aData) {
nsMemory::Free(aElement); nsMemory::Free(aElement);
return PR_TRUE; return PR_TRUE;

2
extensions/spellcheck/src/mozPersonalDictionary.cpp
View file

@ -155,7 +155,7 @@ NS_IMETHODIMP mozPersonalDictionary::Load()
// A little helper function to add the key to the list. // A little helper function to add the key to the list.
// This is not threadsafe, and only safe if the consumer does not // This is not threadsafe, and only safe if the consumer does not
// modify the list. // modify the list.
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
AddHostToStringArray(nsUniCharEntry *aEntry, void *aArg) AddHostToStringArray(nsUniCharEntry *aEntry, void *aArg)
{ {
static_cast<nsStringArray*>(aArg)->AppendString(nsDependentString(aEntry->GetKey())); static_cast<nsStringArray*>(aArg)->AppendString(nsDependentString(aEntry->GetKey()));

2
gfx/src/nsDeviceContext.cpp
View file

@ -70,7 +70,7 @@ DeviceContextImpl::DeviceContextImpl()
#endif #endif
} }
static PRBool PR_CALLBACK DeleteValue(nsHashKey* aKey, void* aValue, void* closure) static PRBool DeleteValue(nsHashKey* aKey, void* aValue, void* closure)
{ {
delete ((nsString*)aValue); delete ((nsString*)aValue);
return PR_TRUE; return PR_TRUE;

4
gfx/src/thebes/nsThebesGfxFactory.cpp
View file

@ -137,13 +137,13 @@ static const nsModuleComponentInfo components[] =
gfxImageFrameConstructor }, gfxImageFrameConstructor },
}; };
PR_STATIC_CALLBACK(nsresult) static nsresult
nsThebesGfxModuleCtor(nsIModule *self) nsThebesGfxModuleCtor(nsIModule *self)
{ {
return gfxPlatform::Init(); return gfxPlatform::Init();
} }
PR_STATIC_CALLBACK(void) static void
nsThebesGfxModuleDtor(nsIModule *self) nsThebesGfxModuleDtor(nsIModule *self)
{ {
nsThebesDeviceContext::Shutdown(); nsThebesDeviceContext::Shutdown();

2
gfx/tests/coverage/nsCoverage.cpp
View file

@ -252,7 +252,7 @@ nsPoint *pointlist;
* Main Handler * Main Handler
*-------------------------------------------------------------------------------- *--------------------------------------------------------------------------------
*/ */
nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent) nsEventStatus HandleEvent(nsGUIEvent *aEvent)
{ {
nsEventStatus result = nsEventStatus_eIgnore; nsEventStatus result = nsEventStatus_eIgnore;

10
gfx/thebes/public/gfxWindowsPlatform.h
View file

@ -123,11 +123,11 @@ private:
const NEWTEXTMETRICEXW *nmetrics, const NEWTEXTMETRICEXW *nmetrics,
DWORD fontType, LPARAM data); DWORD fontType, LPARAM data);
static PLDHashOperator PR_CALLBACK FontGetStylesProc(nsStringHashKey::KeyType aKey, static PLDHashOperator FontGetStylesProc(nsStringHashKey::KeyType aKey,
nsRefPtr<FontFamily>& aFontFamily, nsRefPtr<FontFamily>& aFontFamily,
void* userArg); void* userArg);
static PLDHashOperator PR_CALLBACK FontGetCMapDataProc(nsStringHashKey::KeyType aKey, static PLDHashOperator FontGetCMapDataProc(nsStringHashKey::KeyType aKey,
nsRefPtr<FontFamily>& aFontFamily, nsRefPtr<FontFamily>& aFontFamily,
void* userArg); void* userArg);
@ -135,17 +135,17 @@ private:
const NEWTEXTMETRICEXW *metrics, const NEWTEXTMETRICEXW *metrics,
DWORD fontType, LPARAM data); DWORD fontType, LPARAM data);
static PLDHashOperator PR_CALLBACK HashEnumFunc(nsStringHashKey::KeyType aKey, static PLDHashOperator HashEnumFunc(nsStringHashKey::KeyType aKey,
nsRefPtr<FontFamily>& aData, nsRefPtr<FontFamily>& aData,
void* userArg); void* userArg);
static PLDHashOperator PR_CALLBACK FindFontForCharProc(nsStringHashKey::KeyType aKey, static PLDHashOperator FindFontForCharProc(nsStringHashKey::KeyType aKey,
nsRefPtr<FontFamily>& aFontFamily, nsRefPtr<FontFamily>& aFontFamily,
void* userArg); void* userArg);
virtual cmsHPROFILE GetPlatformCMSOutputProfile(); virtual cmsHPROFILE GetPlatformCMSOutputProfile();
static int PR_CALLBACK PrefChangedCallback(const char*, void*); static int PrefChangedCallback(const char*, void*);
// gfxFontInfoLoader overrides, used to load in font cmaps // gfxFontInfoLoader overrides, used to load in font cmaps
virtual void InitLoader(); virtual void InitLoader();

8
gfx/thebes/src/gfxQuartzFontCache.h
View file

@ -230,7 +230,7 @@ public:
gfxFontEntry* MakePlatformFont(const gfxFontEntry *aProxyEntry, const gfxDownloadedFontData* aFontData); gfxFontEntry* MakePlatformFont(const gfxFontEntry *aProxyEntry, const gfxDownloadedFontData* aFontData);
private: private:
static PLDHashOperator PR_CALLBACK FindFontForCharProc(nsStringHashKey::KeyType aKey, static PLDHashOperator FindFontForCharProc(nsStringHashKey::KeyType aKey,
nsRefPtr<MacOSFamilyEntry>& aFamilyEntry, nsRefPtr<MacOSFamilyEntry>& aFamilyEntry,
void* userArg); void* userArg);
@ -260,15 +260,15 @@ private:
// explicitly set font traits for all faces to fixed-pitch // explicitly set font traits for all faces to fixed-pitch
void SetFixedPitch(const nsAString& aFamilyName); void SetFixedPitch(const nsAString& aFamilyName);
static PLDHashOperator PR_CALLBACK InitOtherFamilyNamesProc(nsStringHashKey::KeyType aKey, static PLDHashOperator InitOtherFamilyNamesProc(nsStringHashKey::KeyType aKey,
nsRefPtr<MacOSFamilyEntry>& aFamilyEntry, nsRefPtr<MacOSFamilyEntry>& aFamilyEntry,
void* userArg); void* userArg);
void GenerateFontListKey(const nsAString& aKeyName, nsAString& aResult); void GenerateFontListKey(const nsAString& aKeyName, nsAString& aResult);
static void ATSNotification(ATSFontNotificationInfoRef aInfo, void* aUserArg); static void ATSNotification(ATSFontNotificationInfoRef aInfo, void* aUserArg);
static int PR_CALLBACK PrefChangedCallback(const char *aPrefName, void *closure); static int PrefChangedCallback(const char *aPrefName, void *closure);
static PLDHashOperator PR_CALLBACK static PLDHashOperator
HashEnumFuncForFamilies(nsStringHashKey::KeyType aKey, HashEnumFuncForFamilies(nsStringHashKey::KeyType aKey,
nsRefPtr<MacOSFamilyEntry>& aFamilyEntry, nsRefPtr<MacOSFamilyEntry>& aFamilyEntry,
void* aUserArg); void* aUserArg);

4
gfx/thebes/src/gfxTextRunWordCache.cpp
View file

@ -185,7 +185,7 @@ protected:
nsTHashtable<CacheHashEntry> mCache; nsTHashtable<CacheHashEntry> mCache;
#ifdef DEBUG #ifdef DEBUG
static PLDHashOperator PR_CALLBACK CacheDumpEntry(CacheHashEntry* aEntry, void* userArg); static PLDHashOperator CacheDumpEntry(CacheHashEntry* aEntry, void* userArg);
#endif #endif
}; };
@ -767,7 +767,7 @@ TextRunWordCache::CacheHashEntry::HashKey(const KeyTypePointer aKey)
} }
#ifdef DEBUG #ifdef DEBUG
PLDHashOperator PR_CALLBACK PLDHashOperator
TextRunWordCache::CacheDumpEntry(CacheHashEntry* aEntry, void* userArg) TextRunWordCache::CacheDumpEntry(CacheHashEntry* aEntry, void* userArg)
{ {
FILE* output = static_cast<FILE*>(userArg); FILE* output = static_cast<FILE*>(userArg);

8
gfx/thebes/src/gfxWindowsPlatform.cpp
View file

@ -75,7 +75,7 @@ BuildKeyNameFromFontName(nsAString &aName)
ToLowerCase(aName); ToLowerCase(aName);
} }
int PR_CALLBACK int
gfxWindowsPlatform::PrefChangedCallback(const char *aPrefName, void *closure) gfxWindowsPlatform::PrefChangedCallback(const char *aPrefName, void *closure)
{ {
// XXX this could be made to only clear out the cache for the prefs that were changed // XXX this could be made to only clear out the cache for the prefs that were changed
@ -154,7 +154,7 @@ struct FontListData {
nsStringArray& mStringArray; nsStringArray& mStringArray;
}; };
PLDHashOperator PR_CALLBACK PLDHashOperator
gfxWindowsPlatform::HashEnumFunc(nsStringHashKey::KeyType aKey, gfxWindowsPlatform::HashEnumFunc(nsStringHashKey::KeyType aKey,
nsRefPtr<FontFamily>& aFontFamily, nsRefPtr<FontFamily>& aFontFamily,
void* userArg) void* userArg)
@ -284,7 +284,7 @@ struct FontFamilyListData {
: mFamilyArray(aFamilyArray) : mFamilyArray(aFamilyArray)
{} {}
static PLDHashOperator PR_CALLBACK AppendFamily(nsStringHashKey::KeyType aKey, static PLDHashOperator AppendFamily(nsStringHashKey::KeyType aKey,
nsRefPtr<FontFamily>& aFamilyEntry, nsRefPtr<FontFamily>& aFamilyEntry,
void *aUserArg) void *aUserArg)
{ {
@ -443,7 +443,7 @@ struct FontSearch {
nsRefPtr<FontEntry> bestMatch; nsRefPtr<FontEntry> bestMatch;
}; };
PLDHashOperator PR_CALLBACK PLDHashOperator
gfxWindowsPlatform::FindFontForCharProc(nsStringHashKey::KeyType aKey, gfxWindowsPlatform::FindFontForCharProc(nsStringHashKey::KeyType aKey,
nsRefPtr<FontFamily>& aFontFamily, nsRefPtr<FontFamily>& aFontFamily,
void* userArg) void* userArg)

8
intl/locale/src/nsLocale.h
View file

@ -75,10 +75,10 @@ protected:
NS_IMETHOD AddCategory(const nsAString& category, const nsAString& value); NS_IMETHOD AddCategory(const nsAString& category, const nsAString& value);
static PLHashNumber PR_CALLBACK Hash_HashFunction(const void* key); static PLHashNumber Hash_HashFunction(const void* key);
static PRIntn PR_CALLBACK Hash_CompareNSString(const void* s1, const void* s2); static PRIntn Hash_CompareNSString(const void* s1, const void* s2);
static PRIntn PR_CALLBACK Hash_EnumerateDelete(PLHashEntry *he, PRIntn hashIndex, void *arg); static PRIntn Hash_EnumerateDelete(PLHashEntry *he, PRIntn hashIndex, void *arg);
static PRIntn PR_CALLBACK Hash_EnumerateCopy(PLHashEntry *he, PRIntn hashIndex, void *arg); static PRIntn Hash_EnumerateCopy(PLHashEntry *he, PRIntn hashIndex, void *arg);
PLHashTable* fHashtable; PLHashTable* fHashtable;
PRUint32 fCategoryCount; PRUint32 fCategoryCount;

2
ipc/ipcd/client/src/ipcConnectionUnix.cpp
View file

@ -300,7 +300,7 @@ ConnWrite(ipcConnectionState *s)
return rv; return rv;
} }
PR_STATIC_CALLBACK(void) static void
ConnThread(void *arg) ConnThread(void *arg)
{ {
PRInt32 num; PRInt32 num;

4
ipc/ipcd/client/src/ipcModuleFactory.cpp
View file

@ -175,13 +175,13 @@ static const nsModuleComponentInfo components[] = {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PR_STATIC_CALLBACK(nsresult) static nsresult
ipcdclient_init(nsIModule *module) ipcdclient_init(nsIModule *module)
{ {
return IPC_Init(); return IPC_Init();
} }
PR_STATIC_CALLBACK(void) static void
ipcdclient_shutdown(nsIModule *module) ipcdclient_shutdown(nsIModule *module)
{ {
IPC_Shutdown(); IPC_Shutdown();

2
ipc/ipcd/client/src/ipcdclient.cpp
View file

@ -986,7 +986,7 @@ end:
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
EnumerateTargetMapAndNotify(const nsID &aKey, EnumerateTargetMapAndNotify(const nsID &aKey,
ipcTargetData *aData, ipcTargetData *aData,
void *aClosure) void *aClosure)

2
ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
View file

@ -1330,7 +1330,7 @@ SetupPeerInstance(PRUint32 aPeerID, DConnectSetup *aMsg, PRUint32 aMsgLen,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
DestroyDConnectInstance(const void *key, DestroyDConnectInstance(const void *key,
DConnectInstance *wrapper, DConnectInstance *wrapper,
void *userArg) void *userArg)

10
ipc/ipcd/extensions/lock/src/module/ipcLockModule.cpp
View file

@ -84,25 +84,25 @@ struct ipcLockContext
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PR_STATIC_CALLBACK(void *) static void *
ipcLockModule_AllocTable(void *pool, PRSize size) ipcLockModule_AllocTable(void *pool, PRSize size)
{ {
return malloc(size); return malloc(size);
} }
PR_STATIC_CALLBACK(void) static void
ipcLockModule_FreeTable(void *pool, void *item) ipcLockModule_FreeTable(void *pool, void *item)
{ {
free(item); free(item);
} }
PR_STATIC_CALLBACK(PLHashEntry *) static PLHashEntry *
ipcLockModule_AllocEntry(void *pool, const void *key) ipcLockModule_AllocEntry(void *pool, const void *key)
{ {
return (PLHashEntry *) malloc(sizeof(PLHashEntry)); return (PLHashEntry *) malloc(sizeof(PLHashEntry));
} }
PR_STATIC_CALLBACK(void) static void
ipcLockModule_FreeEntry(void *pool, PLHashEntry *he, PRUintn flag) ipcLockModule_FreeEntry(void *pool, PLHashEntry *he, PRUintn flag)
{ {
PL_strfree((char *) he->key); PL_strfree((char *) he->key);
@ -226,7 +226,7 @@ ipcLockModule_ReleaseLock(PRUint32 cid, const char *key)
PL_HashTableRemove(gLockTable, key); PL_HashTableRemove(gLockTable, key);
} }
PR_STATIC_CALLBACK(PRIntn) static PRIntn
ipcLockModule_ReleaseByCID(PLHashEntry *he, PRIntn i, void *arg) ipcLockModule_ReleaseByCID(PLHashEntry *he, PRIntn i, void *arg)
{ {
PRUint32 cid = *(PRUint32 *) arg; PRUint32 cid = *(PRUint32 *) arg;

2
ipc/ipcd/extensions/lock/test/TestIPCLocks.cpp
View file

@ -99,7 +99,7 @@ static void RandomSleep(PRUint32 fromMS, PRUint32 toMS)
static ipcILockService *gLockService; static ipcILockService *gLockService;
PR_STATIC_CALLBACK(void) TestThread(void *arg) static void TestThread(void *arg)
{ {
const char *lockName = (const char *) arg; const char *lockName = (const char *) arg;

2
jpeg/jmorecfg.h
View file

@ -216,7 +216,7 @@ typedef unsigned int JDIMENSION;
#include "prtypes.h" #include "prtypes.h"
/* a function called through method pointers: */ /* a function called through method pointers: */
#define METHODDEF(type) static type PR_CALLBACK #define METHODDEF(type) static type
/* a function used only in its module: */ /* a function used only in its module: */
#define LOCAL(type) static type #define LOCAL(type) static type

6
js/jsd/jsd_java.c
View file

@ -139,7 +139,7 @@ _scriptObFromJSDScriptPtr( ExecEnv* ee, JSDScript* jsdscript )
/***************************************************************************/ /***************************************************************************/
void PR_CALLBACK void
_scriptHook( JSDContext* jsdc, _scriptHook( JSDContext* jsdc,
JSDScript* jsdscript, JSDScript* jsdscript,
JSBool creating, JSBool creating,
@ -221,7 +221,7 @@ _scriptHook( JSDContext* jsdc,
} }
/***************************************************************************/ /***************************************************************************/
PRUintn PR_CALLBACK PRUintn
_executionHook( JSDContext* jsdc, _executionHook( JSDContext* jsdc,
JSDThreadState* jsdstate, JSDThreadState* jsdstate,
PRUintn type, PRUintn type,
@ -340,7 +340,7 @@ _executionHook( JSDContext* jsdc,
return JSD_HOOK_RETURN_CONTINUE; return JSD_HOOK_RETURN_CONTINUE;
} }
PRUintn PR_CALLBACK PRUintn
_errorReporter( JSDContext* jsdc, _errorReporter( JSDContext* jsdc,
JSContext* cx, JSContext* cx,
const char* message, const char* message,

2
js/src/prmjtime.cpp
View file

@ -229,7 +229,7 @@ NowCalibrate()
#define LASTLOCK_SPINCOUNT 4096 #define LASTLOCK_SPINCOUNT 4096
#ifdef JS_THREADSAFE #ifdef JS_THREADSAFE
static PRStatus PR_CALLBACK static PRStatus
NowInit(void) NowInit(void)
{ {
memset(&calibration, 0, sizeof(calibration)); memset(&calibration, 0, sizeof(calibration));

2
js/src/xpconnect/src/xpcjsruntime.cpp
View file

@ -328,7 +328,7 @@ void XPCJSRuntime::TraceJS(JSTracer* trc, void* data)
} }
} }
PR_STATIC_CALLBACK(void) static void
TraceJSObject(PRUint32 aLangID, void *aScriptThing, void *aClosure) TraceJSObject(PRUint32 aLangID, void *aScriptThing, void *aClosure)
{ {
if(aLangID == nsIProgrammingLanguage::JAVASCRIPT) if(aLangID == nsIProgrammingLanguage::JAVASCRIPT)

4
js/src/xpconnect/src/xpcmodule.cpp
View file

@ -108,7 +108,7 @@ static const nsModuleComponentInfo components[] = {
#endif #endif
}; };
PR_STATIC_CALLBACK(nsresult) static nsresult
xpcModuleCtor(nsIModule* self) xpcModuleCtor(nsIModule* self)
{ {
nsXPConnect::InitStatics(); nsXPConnect::InitStatics();
@ -125,7 +125,7 @@ xpcModuleCtor(nsIModule* self)
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(void) static void
xpcModuleDtor(nsIModule* self) xpcModuleDtor(nsIModule* self)
{ {
// Release our singletons // Release our singletons

2
js/src/xpconnect/src/xpcthreadcontext.cpp
View file

@ -534,7 +534,7 @@ XPCPerThreadData::~XPCPerThreadData()
} }
} }
PR_STATIC_CALLBACK(void) static void
xpc_ThreadDataDtorCB(void* ptr) xpc_ThreadDataDtorCB(void* ptr)
{ {
XPCPerThreadData* data = (XPCPerThreadData*) ptr; XPCPerThreadData* data = (XPCPerThreadData*) ptr;

2
layout/base/nsCSSFrameConstructor.cpp
View file

@ -13199,7 +13199,7 @@ nsCSSFrameConstructor::RestyleForRemove(nsIContent* aContainer,
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
CollectRestyles(nsISupports* aContent, CollectRestyles(nsISupports* aContent,
nsCSSFrameConstructor::RestyleData& aData, nsCSSFrameConstructor::RestyleData& aData,
void* aRestyleArrayPtr) void* aRestyleArrayPtr)

2
layout/base/nsCSSFrameConstructor.h
View file

@ -75,7 +75,7 @@ struct nsFindFrameHint
nsFindFrameHint() : mPrimaryFrameForPrevSibling(nsnull) { } nsFindFrameHint() : mPrimaryFrameForPrevSibling(nsnull) { }
}; };
typedef void (PR_CALLBACK nsLazyFrameConstructionCallback) typedef void (nsLazyFrameConstructionCallback)
(nsIContent* aContent, nsIFrame* aFrame, void* aArg); (nsIContent* aContent, nsIFrame* aFrame, void* aArg);
class nsFrameConstructorState; class nsFrameConstructorState;

6
layout/base/nsCounterManager.cpp
View file

@ -285,7 +285,7 @@ nsCounterManager::CounterListFor(const nsSubstring& aCounterName)
return counterList; return counterList;
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
RecalcDirtyLists(const nsAString& aKey, nsCounterList* aList, void* aClosure) RecalcDirtyLists(const nsAString& aKey, nsCounterList* aList, void* aClosure)
{ {
if (aList->IsDirty()) if (aList->IsDirty())
@ -310,7 +310,7 @@ struct DestroyNodesData {
PRBool mDestroyedAny; PRBool mDestroyedAny;
}; };
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
DestroyNodesInList(const nsAString& aKey, nsCounterList* aList, void* aClosure) DestroyNodesInList(const nsAString& aKey, nsCounterList* aList, void* aClosure)
{ {
DestroyNodesData *data = static_cast<DestroyNodesData*>(aClosure); DestroyNodesData *data = static_cast<DestroyNodesData*>(aClosure);
@ -330,7 +330,7 @@ nsCounterManager::DestroyNodesFor(nsIFrame *aFrame)
} }
#ifdef DEBUG #ifdef DEBUG
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
DumpList(const nsAString& aKey, nsCounterList* aList, void* aClosure) DumpList(const nsAString& aKey, nsCounterList* aList, void* aClosure)
{ {
printf("Counter named \"%s\":\n", NS_ConvertUTF16toUTF8(aKey).get()); printf("Counter named \"%s\":\n", NS_ConvertUTF16toUTF8(aKey).get());

4
layout/base/nsDocumentViewer.cpp
View file

@ -2067,7 +2067,7 @@ DocumentViewerImpl::RequestWindowClose(PRBool* aCanClose)
return NS_OK; return NS_OK;
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
AppendAgentSheet(nsIStyleSheet *aSheet, void *aData) AppendAgentSheet(nsIStyleSheet *aSheet, void *aData)
{ {
nsStyleSet *styleSet = static_cast<nsStyleSet*>(aData); nsStyleSet *styleSet = static_cast<nsStyleSet*>(aData);
@ -2075,7 +2075,7 @@ AppendAgentSheet(nsIStyleSheet *aSheet, void *aData)
return PR_TRUE; return PR_TRUE;
} }
PR_STATIC_CALLBACK(PRBool) static PRBool
PrependUserSheet(nsIStyleSheet *aSheet, void *aData) PrependUserSheet(nsIStyleSheet *aSheet, void *aData)
{ {
nsStyleSet *styleSet = static_cast<nsStyleSet*>(aData); nsStyleSet *styleSet = static_cast<nsStyleSet*>(aData);

8
layout/base/nsFrameManager.cpp
View file

@ -126,7 +126,7 @@ struct PlaceholderMapEntry : public PLDHashEntryHdr {
nsPlaceholderFrame *placeholderFrame; nsPlaceholderFrame *placeholderFrame;
}; };
PR_STATIC_CALLBACK(PRBool) static PRBool
PlaceholderMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, PlaceholderMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
const void *key) const void *key)
{ {
@ -163,7 +163,7 @@ struct PrimaryFrameMapEntry : public PLDHashEntryHdr {
// These ops should be used if/when we switch back to a 2-word entry. // These ops should be used if/when we switch back to a 2-word entry.
// See comment in |PrimaryFrameMapEntry| above. // See comment in |PrimaryFrameMapEntry| above.
#if 0 #if 0
PR_STATIC_CALLBACK(PRBool) static PRBool
PrimaryFrameMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr, PrimaryFrameMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
const void *key) const void *key)
{ {
@ -521,7 +521,7 @@ nsFrameManager::UnregisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame
} }
} }
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
UnregisterPlaceholders(PLDHashTable* table, PLDHashEntryHdr* hdr, UnregisterPlaceholders(PLDHashTable* table, PLDHashEntryHdr* hdr,
PRUint32 number, void* arg) PRUint32 number, void* arg)
{ {
@ -1828,7 +1828,7 @@ nsFrameManagerBase::UndisplayedMap::RemoveNodesFor(nsIContent* aParentContent)
} }
} }
PR_STATIC_CALLBACK(PRIntn) static PRIntn
RemoveUndisplayedEntry(PLHashEntry* he, PRIntn i, void* arg) RemoveUndisplayedEntry(PLHashEntry* he, PRIntn i, void* arg)
{ {
UndisplayedNode* node = (UndisplayedNode*)(he->value); UndisplayedNode* node = (UndisplayedNode*)(he->value);

2
layout/base/nsIFocusEventSuppressor.h
View file

@ -39,7 +39,7 @@
#define nsIFocusEventSuppressor_h___ #define nsIFocusEventSuppressor_h___
#include "nsISupports.h" #include "nsISupports.h"
typedef void (*PR_CALLBACK nsFocusEventSuppressorCallback)(PRBool aSuppress); typedef void (* nsFocusEventSuppressorCallback)(PRBool aSuppress);
#define NS_NSIFOCUSEVENTSUPPRESSORSERVICE_IID \ #define NS_NSIFOCUSEVENTSUPPRESSORSERVICE_IID \
{ 0x8aae5cee, 0x59ab, 0x42d4, \ { 0x8aae5cee, 0x59ab, 0x42d4, \

8
layout/base/nsPresContext.cpp
View file

@ -111,7 +111,7 @@ MakeColorPref(const char *colstr)
return colorref; return colorref;
} }
int PR_CALLBACK int
nsPresContext::PrefChangedCallback(const char* aPrefName, void* instance_data) nsPresContext::PrefChangedCallback(const char* aPrefName, void* instance_data)
{ {
nsPresContext* presContext = (nsPresContext*)instance_data; nsPresContext* presContext = (nsPresContext*)instance_data;
@ -149,7 +149,7 @@ IsVisualCharset(const nsCString& aCharset)
#endif // IBMBIDI #endif // IBMBIDI
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
destroy_loads(const void * aKey, nsCOMPtr<nsImageLoader>& aData, void* closure) destroy_loads(const void * aKey, nsCOMPtr<nsImageLoader>& aData, void* closure)
{ {
aData->Destroy(); aData->Destroy();
@ -298,7 +298,7 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPresContext) NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPresContext)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPresContext) NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPresContext)
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
TraverseImageLoader(const void * aKey, nsCOMPtr<nsImageLoader>& aData, TraverseImageLoader(const void * aKey, nsCOMPtr<nsImageLoader>& aData,
void* aClosure) void* aClosure)
{ {
@ -1027,7 +1027,7 @@ static void SetImgAnimModeOnImgReq(imgIRequest* aImgReq, PRUint16 aMode)
} }
// Enumeration call back for HashTable // Enumeration call back for HashTable
PR_STATIC_CALLBACK(PLDHashOperator) static PLDHashOperator
set_animation_mode(const void * aKey, nsCOMPtr<nsImageLoader>& aData, void* closure) set_animation_mode(const void * aKey, nsCOMPtr<nsImageLoader>& aData, void* closure)
{ {
imgIRequest* imgReq = aData->GetRequest(); imgIRequest* imgReq = aData->GetRequest();

Some files were not shown because too many files have changed in this diff Show more