mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Renaming nsQuickSort to NS_QuickSort so it doesn't look like a class name. r=brendan@netscape.com
This commit is contained in:
parent
d7ab07b95d
commit
492b4cef0f
@ -32,8 +32,9 @@
|
||||
*/
|
||||
NS_BEGIN_EXTERN_C
|
||||
|
||||
PR_EXTERN(void) nsQuickSort(void *, unsigned int, unsigned int,
|
||||
int (*)(const void *, const void *, void *), void *);
|
||||
PR_EXTERN(void) NS_QuickSort(void *, unsigned int, unsigned int,
|
||||
int (*)(const void *, const void *, void *),
|
||||
void *);
|
||||
|
||||
NS_END_EXTERN_C
|
||||
|
||||
|
@ -97,7 +97,7 @@ med3(char *a, char *b, char *c, cmp_t* cmp, void *data)
|
||||
:(cmp(b, c, data) > 0 ? b : (cmp(a, c, data) < 0 ? a : c ));
|
||||
}
|
||||
|
||||
void nsQuickSort (
|
||||
void NS_QuickSort (
|
||||
void *a,
|
||||
unsigned int n,
|
||||
unsigned int es,
|
||||
@ -171,12 +171,12 @@ loop: SWAPINIT(a, es);
|
||||
r = PR_MIN(pd - pc, pn - pd - es);
|
||||
vecswap(pb, pn - r, r);
|
||||
if ((r = pb - pa) > es)
|
||||
nsQuickSort(a, r / es, es, cmp, data);
|
||||
NS_QuickSort(a, r / es, es, cmp, data);
|
||||
if ((r = pd - pc) > es) {
|
||||
/* Iterate rather than recurse to save stack space */
|
||||
a = pn - r;
|
||||
n = r / es;
|
||||
goto loop;
|
||||
}
|
||||
/* nsQuickSort(pn - r, r / es, es, cmp, data);*/
|
||||
/* NS_QuickSort(pn - r, r / es, es, cmp, data);*/
|
||||
}
|
||||
|
@ -881,7 +881,7 @@ XULSortServiceImpl::SortTreeChildren(nsIContent *container, PRInt32 colIndex, so
|
||||
{
|
||||
if (loop > startIndex+1)
|
||||
{
|
||||
nsQuickSort((void *)&flatArray[startIndex], loop-startIndex, sizeof(nsIContent *),
|
||||
NS_QuickSort((void *)&flatArray[startIndex], loop-startIndex, sizeof(nsIContent *),
|
||||
inplaceSortCallback, (void *)sortInfo);
|
||||
startIndex = loop+1;
|
||||
}
|
||||
@ -890,14 +890,14 @@ XULSortServiceImpl::SortTreeChildren(nsIContent *container, PRInt32 colIndex, so
|
||||
}
|
||||
if (loop > startIndex+1)
|
||||
{
|
||||
nsQuickSort((void *)&flatArray[startIndex], loop-startIndex, sizeof(nsIContent *),
|
||||
NS_QuickSort((void *)&flatArray[startIndex], loop-startIndex, sizeof(nsIContent *),
|
||||
inplaceSortCallback, (void *)sortInfo);
|
||||
startIndex = loop+1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
nsQuickSort((void *)flatArray, numElements, sizeof(nsIContent *),
|
||||
NS_QuickSort((void *)flatArray, numElements, sizeof(nsIContent *),
|
||||
inplaceSortCallback, (void *)sortInfo);
|
||||
}
|
||||
|
||||
@ -993,7 +993,7 @@ XULSortServiceImpl::OpenContainer(nsIRDFCompositeDataSource *db, nsIContent *con
|
||||
sortInfo.descendingSort = PR_TRUE;
|
||||
else
|
||||
sortInfo.descendingSort = PR_FALSE;
|
||||
nsQuickSort((void *)flatArray, numElements, elementSize, openSortCallback, (void *)&sortInfo);
|
||||
NS_QuickSort((void *)flatArray, numElements, elementSize, openSortCallback, (void *)&sortInfo);
|
||||
}
|
||||
return(NS_OK);
|
||||
}
|
||||
|
@ -1498,7 +1498,7 @@ CompareSizes(const void* aArg1, const void* aArg2, void *data)
|
||||
void
|
||||
nsFontStretch::SortSizes(void)
|
||||
{
|
||||
nsQuickSort(mSizes, mSizesCount, sizeof(*mSizes), CompareSizes, NULL);
|
||||
NS_QuickSort(mSizes, mSizesCount, sizeof(*mSizes), CompareSizes, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -1502,7 +1502,7 @@ CompareSizes(const void* aArg1, const void* aArg2, void *data)
|
||||
void
|
||||
nsFontStretch::SortSizes(void)
|
||||
{
|
||||
nsQuickSort(mSizes, mSizesCount, sizeof(*mSizes), CompareSizes, NULL);
|
||||
NS_QuickSort(mSizes, mSizesCount, sizeof(*mSizes), CompareSizes, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -268,5 +268,5 @@ static int CompareDWord (const void *v1, const void *v2, void *)
|
||||
void nsUInt32Array::QuickSort (int (*compare) (const void *elem1, const void *elem2, void *data))
|
||||
{
|
||||
if (m_nSize > 1)
|
||||
nsQuickSort(m_pData, m_nSize, sizeof(void*), compare ? compare : CompareDWord, nsnull);
|
||||
NS_QuickSort(m_pData, m_nSize, sizeof(void*), compare ? compare : CompareDWord, nsnull);
|
||||
}
|
||||
|
@ -3793,7 +3793,7 @@ nsMsgCompose::ResultsRecipients(PRBool cancelled, PRInt32* nohtml,
|
||||
}
|
||||
if (changed) {
|
||||
// Now nuke dups.
|
||||
nsQuickSort(domainstrings, num, sizeof(char*), DomainCompare, NULL);
|
||||
NS_QuickSort(domainstrings, num, sizeof(char*), DomainCompare, NULL);
|
||||
for (i=0 ; i < num-1 ; i++) {
|
||||
while (i < num-1 &&
|
||||
PL_strcmp(domainstrings[i], domainstrings[i+1]) == 0) {
|
||||
|
@ -881,7 +881,7 @@ XULSortServiceImpl::SortTreeChildren(nsIContent *container, PRInt32 colIndex, so
|
||||
{
|
||||
if (loop > startIndex+1)
|
||||
{
|
||||
nsQuickSort((void *)&flatArray[startIndex], loop-startIndex, sizeof(nsIContent *),
|
||||
NS_QuickSort((void *)&flatArray[startIndex], loop-startIndex, sizeof(nsIContent *),
|
||||
inplaceSortCallback, (void *)sortInfo);
|
||||
startIndex = loop+1;
|
||||
}
|
||||
@ -890,14 +890,14 @@ XULSortServiceImpl::SortTreeChildren(nsIContent *container, PRInt32 colIndex, so
|
||||
}
|
||||
if (loop > startIndex+1)
|
||||
{
|
||||
nsQuickSort((void *)&flatArray[startIndex], loop-startIndex, sizeof(nsIContent *),
|
||||
NS_QuickSort((void *)&flatArray[startIndex], loop-startIndex, sizeof(nsIContent *),
|
||||
inplaceSortCallback, (void *)sortInfo);
|
||||
startIndex = loop+1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
nsQuickSort((void *)flatArray, numElements, sizeof(nsIContent *),
|
||||
NS_QuickSort((void *)flatArray, numElements, sizeof(nsIContent *),
|
||||
inplaceSortCallback, (void *)sortInfo);
|
||||
}
|
||||
|
||||
@ -993,7 +993,7 @@ XULSortServiceImpl::OpenContainer(nsIRDFCompositeDataSource *db, nsIContent *con
|
||||
sortInfo.descendingSort = PR_TRUE;
|
||||
else
|
||||
sortInfo.descendingSort = PR_FALSE;
|
||||
nsQuickSort((void *)flatArray, numElements, elementSize, openSortCallback, (void *)&sortInfo);
|
||||
NS_QuickSort((void *)flatArray, numElements, elementSize, openSortCallback, (void *)&sortInfo);
|
||||
}
|
||||
return(NS_OK);
|
||||
}
|
||||
|
@ -97,7 +97,7 @@ med3(char *a, char *b, char *c, cmp_t* cmp, void *data)
|
||||
:(cmp(b, c, data) > 0 ? b : (cmp(a, c, data) < 0 ? a : c ));
|
||||
}
|
||||
|
||||
void nsQuickSort (
|
||||
void NS_QuickSort (
|
||||
void *a,
|
||||
unsigned int n,
|
||||
unsigned int es,
|
||||
@ -171,12 +171,12 @@ loop: SWAPINIT(a, es);
|
||||
r = PR_MIN(pd - pc, pn - pd - es);
|
||||
vecswap(pb, pn - r, r);
|
||||
if ((r = pb - pa) > es)
|
||||
nsQuickSort(a, r / es, es, cmp, data);
|
||||
NS_QuickSort(a, r / es, es, cmp, data);
|
||||
if ((r = pd - pc) > es) {
|
||||
/* Iterate rather than recurse to save stack space */
|
||||
a = pn - r;
|
||||
n = r / es;
|
||||
goto loop;
|
||||
}
|
||||
/* nsQuickSort(pn - r, r / es, es, cmp, data);*/
|
||||
/* NS_QuickSort(pn - r, r / es, es, cmp, data);*/
|
||||
}
|
||||
|
@ -32,8 +32,9 @@
|
||||
*/
|
||||
NS_BEGIN_EXTERN_C
|
||||
|
||||
PR_EXTERN(void) nsQuickSort(void *, unsigned int, unsigned int,
|
||||
int (*)(const void *, const void *, void *), void *);
|
||||
PR_EXTERN(void) NS_QuickSort(void *, unsigned int, unsigned int,
|
||||
int (*)(const void *, const void *, void *),
|
||||
void *);
|
||||
|
||||
NS_END_EXTERN_C
|
||||
|
||||
|
@ -97,7 +97,7 @@ med3(char *a, char *b, char *c, cmp_t* cmp, void *data)
|
||||
:(cmp(b, c, data) > 0 ? b : (cmp(a, c, data) < 0 ? a : c ));
|
||||
}
|
||||
|
||||
void nsQuickSort (
|
||||
void NS_QuickSort (
|
||||
void *a,
|
||||
unsigned int n,
|
||||
unsigned int es,
|
||||
@ -171,12 +171,12 @@ loop: SWAPINIT(a, es);
|
||||
r = PR_MIN(pd - pc, pn - pd - es);
|
||||
vecswap(pb, pn - r, r);
|
||||
if ((r = pb - pa) > es)
|
||||
nsQuickSort(a, r / es, es, cmp, data);
|
||||
NS_QuickSort(a, r / es, es, cmp, data);
|
||||
if ((r = pd - pc) > es) {
|
||||
/* Iterate rather than recurse to save stack space */
|
||||
a = pn - r;
|
||||
n = r / es;
|
||||
goto loop;
|
||||
}
|
||||
/* nsQuickSort(pn - r, r / es, es, cmp, data);*/
|
||||
/* NS_QuickSort(pn - r, r / es, es, cmp, data);*/
|
||||
}
|
||||
|
@ -32,8 +32,9 @@
|
||||
*/
|
||||
NS_BEGIN_EXTERN_C
|
||||
|
||||
PR_EXTERN(void) nsQuickSort(void *, unsigned int, unsigned int,
|
||||
int (*)(const void *, const void *, void *), void *);
|
||||
PR_EXTERN(void) NS_QuickSort(void *, unsigned int, unsigned int,
|
||||
int (*)(const void *, const void *, void *),
|
||||
void *);
|
||||
|
||||
NS_END_EXTERN_C
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user