Skip to content

Commit d159f53

Browse files
author
Isaac Aggrey
committed
Bug 789847 - Remove PR_CALLBACK usage from tree
1 parent 9257521 commit d159f53

26 files changed

+96
-98
lines changed

‎content/smil/nsSMILAnimationController.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ nsSMILAnimationController::Traverse(
213213
}
214214
}
215215

216-
/*static*/ PR_CALLBACK PLDHashOperator
216+
/*static*/ PLDHashOperator
217217
nsSMILAnimationController::CompositorTableEntryTraverse(
218218
nsSMILCompositor* aCompositor,
219219
void* aArg)
@@ -303,7 +303,7 @@ nsSMILAnimationController::MaybeStartSampling(nsRefreshDriver* aRefreshDriver)
303303
//----------------------------------------------------------------------
304304
// Sample-related methods and callbacks
305305

306-
PR_CALLBACK PLDHashOperator
306+
PLDHashOperator
307307
TransferCachedBaseValue(nsSMILCompositor* aCompositor,
308308
void* aData)
309309
{
@@ -319,7 +319,7 @@ TransferCachedBaseValue(nsSMILCompositor* aCompositor,
319319
return PL_DHASH_NEXT;
320320
}
321321

322-
PR_CALLBACK PLDHashOperator
322+
PLDHashOperator
323323
RemoveCompositorFromTable(nsSMILCompositor* aCompositor,
324324
void* aData)
325325
{
@@ -329,15 +329,15 @@ RemoveCompositorFromTable(nsSMILCompositor* aCompositor,
329329
return PL_DHASH_NEXT;
330330
}
331331

332-
PR_CALLBACK PLDHashOperator
332+
PLDHashOperator
333333
DoClearAnimationEffects(nsSMILCompositor* aCompositor,
334334
void* /*aData*/)
335335
{
336336
aCompositor->ClearAnimationEffects();
337337
return PL_DHASH_NEXT;
338338
}
339339

340-
PR_CALLBACK PLDHashOperator
340+
PLDHashOperator
341341
DoComposeAttribute(nsSMILCompositor* aCompositor,
342342
void* /*aData*/)
343343
{
@@ -467,7 +467,7 @@ nsSMILAnimationController::RewindElements()
467467
mChildContainerTable.EnumerateEntries(ClearRewindNeeded, nullptr);
468468
}
469469

470-
/*static*/ PR_CALLBACK PLDHashOperator
470+
/*static*/ PLDHashOperator
471471
nsSMILAnimationController::RewindNeeded(TimeContainerPtrKey* aKey,
472472
void* aData)
473473
{
@@ -484,7 +484,7 @@ nsSMILAnimationController::RewindNeeded(TimeContainerPtrKey* aKey,
484484
return PL_DHASH_NEXT;
485485
}
486486

487-
/*static*/ PR_CALLBACK PLDHashOperator
487+
/*static*/ PLDHashOperator
488488
nsSMILAnimationController::RewindAnimation(AnimationElementPtrKey* aKey,
489489
void* aData)
490490
{
@@ -497,7 +497,7 @@ nsSMILAnimationController::RewindAnimation(AnimationElementPtrKey* aKey,
497497
return PL_DHASH_NEXT;
498498
}
499499

500-
/*static*/ PR_CALLBACK PLDHashOperator
500+
/*static*/ PLDHashOperator
501501
nsSMILAnimationController::ClearRewindNeeded(TimeContainerPtrKey* aKey,
502502
void* aData)
503503
{
@@ -582,7 +582,7 @@ nsSMILAnimationController::DoMilestoneSamples()
582582
}
583583
}
584584

585-
/*static*/ PR_CALLBACK PLDHashOperator
585+
/*static*/ PLDHashOperator
586586
nsSMILAnimationController::GetNextMilestone(TimeContainerPtrKey* aKey,
587587
void* aData)
588588
{
@@ -607,7 +607,7 @@ nsSMILAnimationController::GetNextMilestone(TimeContainerPtrKey* aKey,
607607
return PL_DHASH_NEXT;
608608
}
609609

610-
/*static*/ PR_CALLBACK PLDHashOperator
610+
/*static*/ PLDHashOperator
611611
nsSMILAnimationController::GetMilestoneElements(TimeContainerPtrKey* aKey,
612612
void* aData)
613613
{
@@ -629,7 +629,7 @@ nsSMILAnimationController::GetMilestoneElements(TimeContainerPtrKey* aKey,
629629
return PL_DHASH_NEXT;
630630
}
631631

632-
/*static*/ PR_CALLBACK PLDHashOperator
632+
/*static*/ PLDHashOperator
633633
nsSMILAnimationController::SampleTimeContainer(TimeContainerPtrKey* aKey,
634634
void* aData)
635635
{
@@ -652,7 +652,7 @@ nsSMILAnimationController::SampleTimeContainer(TimeContainerPtrKey* aKey,
652652
return PL_DHASH_NEXT;
653653
}
654654

655-
/*static*/ PR_CALLBACK PLDHashOperator
655+
/*static*/ PLDHashOperator
656656
nsSMILAnimationController::SampleAnimation(AnimationElementPtrKey* aKey,
657657
void* aData)
658658
{

‎content/smil/nsSMILTimedElement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2318,7 +2318,7 @@ nsSMILTimedElement::AreEndTimesDependentOn(
23182318
//----------------------------------------------------------------------
23192319
// Hashtable callback functions
23202320

2321-
/* static */ PR_CALLBACK PLDHashOperator
2321+
/* static */ PLDHashOperator
23222322
nsSMILTimedElement::NotifyNewIntervalCallback(TimeValueSpecPtrKey* aKey,
23232323
void* aData)
23242324
{

‎gfx/thebes/gfxPlatformFontList.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ gfxPlatformFontList::InitOtherFamilyNames()
207207
mFontFamilies.Enumerate(gfxPlatformFontList::InitOtherFamilyNamesProc, this);
208208
}
209209

210-
PLDHashOperator PR_CALLBACK
210+
PLDHashOperator
211211
gfxPlatformFontList::InitOtherFamilyNamesProc(nsStringHashKey::KeyType aKey,
212212
nsRefPtr<gfxFontFamily>& aFamilyEntry,
213213
void* userArg)
@@ -227,7 +227,7 @@ gfxPlatformFontList::InitFaceNameLists()
227227
mFontFamilies.Enumerate(gfxPlatformFontList::InitFaceNameListsProc, this);
228228
}
229229

230-
PLDHashOperator PR_CALLBACK
230+
PLDHashOperator
231231
gfxPlatformFontList::InitFaceNameListsProc(nsStringHashKey::KeyType aKey,
232232
nsRefPtr<gfxFontFamily>& aFamilyEntry,
233233
void* userArg)
@@ -308,7 +308,7 @@ struct FontListData {
308308
nsTArray<nsString>& mListOfFonts;
309309
};
310310

311-
PLDHashOperator PR_CALLBACK
311+
PLDHashOperator
312312
gfxPlatformFontList::HashEnumFuncForFamilies(nsStringHashKey::KeyType aKey,
313313
nsRefPtr<gfxFontFamily>& aFamilyEntry,
314314
void *aUserArg)
@@ -358,9 +358,9 @@ struct FontFamilyListData {
358358
: mFamilyArray(aFamilyArray)
359359
{}
360360

361-
static PLDHashOperator PR_CALLBACK AppendFamily(nsStringHashKey::KeyType aKey,
362-
nsRefPtr<gfxFontFamily>& aFamilyEntry,
363-
void *aUserArg)
361+
static PLDHashOperator AppendFamily(nsStringHashKey::KeyType aKey,
362+
nsRefPtr<gfxFontFamily>& aFamilyEntry,
363+
void *aUserArg)
364364
{
365365
FontFamilyListData *data = static_cast<FontFamilyListData*>(aUserArg);
366366
data->mFamilyArray.AppendElement(aFamilyEntry);
@@ -461,7 +461,7 @@ gfxPlatformFontList::SystemFindFontForChar(const uint32_t aCh,
461461
return fontEntry;
462462
}
463463

464-
PLDHashOperator PR_CALLBACK
464+
PLDHashOperator
465465
gfxPlatformFontList::FindFontForCharProc(nsStringHashKey::KeyType aKey, nsRefPtr<gfxFontFamily>& aFamilyEntry,
466466
void *userArg)
467467
{

‎modules/libpref/public/Preferences.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class nsAdoptingString;
2525
class nsAdoptingCString;
2626

2727
#ifndef have_PrefChangedFunc_typedef
28-
typedef int (*PR_CALLBACK PrefChangedFunc)(const char *, void *);
28+
typedef int (*PrefChangedFunc)(const char *, void *);
2929
#define have_PrefChangedFunc_typedef
3030
#endif
3131

‎security/manager/ssl/src/nsCertOverrideService.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ class nsCertOverrideService MOZ_FINAL : public nsICertOverrideService
142142
void RemoveAllTemporaryOverrides();
143143

144144
typedef void
145-
(*PR_CALLBACK CertOverrideEnumerator)(const nsCertOverride &aSettings,
146-
void *aUserData);
145+
(*CertOverrideEnumerator)(const nsCertOverride &aSettings,
146+
void *aUserData);
147147

148148
// aCert == null: return all overrides
149149
// aCert != null: return overrides that match the given cert

‎security/manager/ssl/src/nsCrypto.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,10 +1469,10 @@ nsSetKeyEnciphermentPOP(CRMFCertReqMsg *certReqMsg, bool isEscrowed)
14691469
return (srv == SECSuccess) ? NS_OK : NS_ERROR_FAILURE;
14701470
}
14711471

1472-
static void PR_CALLBACK
1472+
static void
14731473
nsCRMFEncoderItemCount(void *arg, const char *buf, unsigned long len);
14741474

1475-
static void PR_CALLBACK
1475+
static void
14761476
nsCRMFEncoderItemStore(void *arg, const char *buf, unsigned long len);
14771477

14781478
static nsresult
@@ -1733,14 +1733,14 @@ nsSetProofOfPossession(CRMFCertReqMsg *certReqMsg,
17331733
return nsSet_EC_DHMAC_ProofOfPossession(certReqMsg, keyInfo, certReq);
17341734
}
17351735

1736-
static void PR_CALLBACK
1736+
static void
17371737
nsCRMFEncoderItemCount(void *arg, const char *buf, unsigned long len)
17381738
{
17391739
unsigned long *count = (unsigned long *)arg;
17401740
*count += len;
17411741
}
17421742

1743-
static void PR_CALLBACK
1743+
static void
17441744
nsCRMFEncoderItemStore(void *arg, const char *buf, unsigned long len)
17451745
{
17461746
SECItem *dest = (SECItem *)arg;

‎security/manager/ssl/src/nsIdentityChecking.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ isApprovedForEV(SECOidTag policyOIDTag, CERTCertificate *rootCert)
954954
return false;
955955
}
956956

957-
PRStatus PR_CALLBACK
957+
PRStatus
958958
nsNSSComponent::IdentityInfoInit()
959959
{
960960
for (size_t iEV=0; iEV < (sizeof(myTrustedEVInfos)/sizeof(nsMyTrustedEVInfo)); ++iEV) {

‎security/manager/ssl/src/nsKeygenThread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ nsresult nsKeygenThread::ConsumeResult(
111111
return rv;
112112
}
113113

114-
static void PR_CALLBACK nsKeygenThreadRunner(void *arg)
114+
static void nsKeygenThreadRunner(void *arg)
115115
{
116116
PR_SetCurrentThreadName("Keygen");
117117
nsKeygenThread *self = static_cast<nsKeygenThread *>(arg);

‎security/manager/ssl/src/nsNSSCallbacks.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ void PK11PasswordPromptRunnable::RunOnTargetThread()
771771
}
772772
}
773773

774-
char* PR_CALLBACK
774+
char*
775775
PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg)
776776
{
777777
nsRefPtr<PK11PasswordPromptRunnable> runnable =
@@ -781,7 +781,7 @@ PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg)
781781
return runnable->mResult;
782782
}
783783

784-
void PR_CALLBACK HandshakeCallback(PRFileDesc* fd, void* client_data) {
784+
void HandshakeCallback(PRFileDesc* fd, void* client_data) {
785785
nsNSSShutDownPreventionLock locker;
786786
int32_t sslStatus;
787787
char* signer = nullptr;
@@ -1026,7 +1026,7 @@ static CERT_StringFromCertFcn oldOCSPAIAInfoCallback = nullptr;
10261026
*
10271027
* The result needs to be freed (PORT_Free) when no longer in use.
10281028
*/
1029-
char* PR_CALLBACK MyAlternateOCSPAIAInfoCallback(CERTCertificate *cert) {
1029+
char* MyAlternateOCSPAIAInfoCallback(CERTCertificate *cert) {
10301030
if (cert && !cert->isRoot) {
10311031
unsigned int i;
10321032
for (i=0; i < numResponders; i++) {

‎security/manager/ssl/src/nsNSSCallbacks.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#include "mozilla/Mutex.h"
1616
#include "mozilla/Attributes.h"
1717

18-
char* PR_CALLBACK
18+
char*
1919
PK11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void* arg);
2020

21-
void PR_CALLBACK HandshakeCallback(PRFileDesc *fd, void *client_data);
21+
void HandshakeCallback(PRFileDesc *fd, void *client_data);
2222

2323
SECStatus RegisterMyOCSPAIAInfoCallback();
2424
SECStatus UnregisterMyOCSPAIAInfoCallback();

‎security/manager/ssl/src/nsNSSCertificateDB.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ nsNSSCertificateDB::FindCertNicknames(nsISupports *aToken,
190190
return rv;
191191
}
192192

193-
SECStatus PR_CALLBACK
193+
SECStatus
194194
collect_certs(void *arg, SECItem **certs, int numcerts)
195195
{
196196
CERTDERCerts *collectArgs;
@@ -1209,7 +1209,7 @@ nsNSSCertificateDB::ExportPKCS12File(nsISupports *aToken,
12091209
}
12101210

12111211

1212-
static SECStatus PR_CALLBACK
1212+
static SECStatus
12131213
GetOCSPResponders (CERTCertificate *aCert,
12141214
SECItem *aDBKey,
12151215
void *aArg)

‎security/manager/ssl/src/nsNSSComponent.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,12 @@ int nsNSSComponent::mInstanceCount = 0;
9797
bool nsNSSComponent::globalConstFlagUsePKIXVerification = false;
9898

9999
// XXX tmp callback for slot password
100-
extern char * PR_CALLBACK
101-
pk11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void *arg);
100+
extern char* pk11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void *arg);
102101

103102
#define PIPNSS_STRBUNDLE_URL "chrome://pipnss/locale/pipnss.properties"
104103
#define NSSERR_STRBUNDLE_URL "chrome://pipnss/locale/nsserrors.properties"
105104

106-
static PLHashNumber PR_CALLBACK certHashtable_keyHash(const void *key)
105+
static PLHashNumber certHashtable_keyHash(const void *key)
107106
{
108107
if (!key)
109108
return 0;
@@ -123,7 +122,7 @@ static PLHashNumber PR_CALLBACK certHashtable_keyHash(const void *key)
123122
return hash;
124123
}
125124

126-
static int PR_CALLBACK certHashtable_keyCompare(const void *k1, const void *k2)
125+
static int certHashtable_keyCompare(const void *k1, const void *k2)
127126
{
128127
// return type is a bool, answering the question "are the keys equal?"
129128

@@ -150,7 +149,7 @@ static int PR_CALLBACK certHashtable_keyCompare(const void *k1, const void *k2)
150149
return true;
151150
}
152151

153-
static int PR_CALLBACK certHashtable_valueCompare(const void *v1, const void *v2)
152+
static int certHashtable_valueCompare(const void *v1, const void *v2)
154153
{
155154
// two values are identical if their keys are identical
156155

@@ -163,7 +162,7 @@ static int PR_CALLBACK certHashtable_valueCompare(const void *v1, const void *v2
163162
return certHashtable_keyCompare(&cert1->certKey, &cert2->certKey);
164163
}
165164

166-
static int PR_CALLBACK certHashtable_clearEntry(PLHashEntry *he, int /*index*/, void * /*userdata*/)
165+
static int certHashtable_clearEntry(PLHashEntry *he, int /*index*/, void * /*userdata*/)
167166
{
168167
if (he && he->value) {
169168
CERT_DestroyCertificate((CERTCertificate*)he->value);

‎security/manager/ssl/src/nsNSSComponent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ class nsNSSComponent : public nsISignatureVerifier,
326326
nsRefPtr<nsCERTValInParamWrapper> mDefaultCERTValInParam;
327327
nsRefPtr<nsCERTValInParamWrapper> mDefaultCERTValInParamLocalOnly;
328328

329-
static PRStatus PR_CALLBACK IdentityInfoInit(void);
329+
static PRStatus IdentityInfoInit(void);
330330
PRCallOnceType mIdentityInfoCallOnce;
331331

332332
public:

0 commit comments

Comments
 (0)