From a3948e9888b8f0a9915315b8a560843a5a1d525b Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Mon, 10 May 1999 06:47:04 +0000 Subject: [PATCH] Renaming nsQuickSort to NS_QuickSort so it doesn't look like a class name. r=brendan@netscape.com git-svn-id: svn://10.0.0.236/trunk@30913 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/public/nsQuickSort.h | 5 +++-- mozilla/base/src/nsQuickSort.cpp | 6 +++--- mozilla/content/xul/templates/src/nsXULSortService.cpp | 8 ++++---- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp | 2 +- mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp | 2 +- mozilla/mailnews/base/util/nsUInt32Array.cpp | 2 +- mozilla/mailnews/compose/src/nsMsgCompose.cpp | 2 +- mozilla/rdf/content/src/nsXULSortService.cpp | 8 ++++---- mozilla/xpcom/ds/nsQuickSort.cpp | 6 +++--- mozilla/xpcom/ds/nsQuickSort.h | 5 +++-- mozilla/xpcom/glue/nsQuickSort.cpp | 6 +++--- mozilla/xpcom/glue/nsQuickSort.h | 5 +++-- 12 files changed, 30 insertions(+), 27 deletions(-) diff --git a/mozilla/base/public/nsQuickSort.h b/mozilla/base/public/nsQuickSort.h index b90cb4634f8..93ac78cd0a9 100644 --- a/mozilla/base/public/nsQuickSort.h +++ b/mozilla/base/public/nsQuickSort.h @@ -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 diff --git a/mozilla/base/src/nsQuickSort.cpp b/mozilla/base/src/nsQuickSort.cpp index e799dc79523..9ec22e6247e 100644 --- a/mozilla/base/src/nsQuickSort.cpp +++ b/mozilla/base/src/nsQuickSort.cpp @@ -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);*/ } diff --git a/mozilla/content/xul/templates/src/nsXULSortService.cpp b/mozilla/content/xul/templates/src/nsXULSortService.cpp index 0647f20d1d7..a552a6c3883 100644 --- a/mozilla/content/xul/templates/src/nsXULSortService.cpp +++ b/mozilla/content/xul/templates/src/nsXULSortService.cpp @@ -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); } diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp index f762c69a108..86d94e0378c 100644 --- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp +++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -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 diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp index e955ba0812d..e3062b86b94 100644 --- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp +++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp @@ -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 diff --git a/mozilla/mailnews/base/util/nsUInt32Array.cpp b/mozilla/mailnews/base/util/nsUInt32Array.cpp index 11e1317037c..0939f88b77b 100644 --- a/mozilla/mailnews/base/util/nsUInt32Array.cpp +++ b/mozilla/mailnews/base/util/nsUInt32Array.cpp @@ -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); } diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index e24defc21e8..b2c96bb6220 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -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) { diff --git a/mozilla/rdf/content/src/nsXULSortService.cpp b/mozilla/rdf/content/src/nsXULSortService.cpp index 0647f20d1d7..a552a6c3883 100644 --- a/mozilla/rdf/content/src/nsXULSortService.cpp +++ b/mozilla/rdf/content/src/nsXULSortService.cpp @@ -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); } diff --git a/mozilla/xpcom/ds/nsQuickSort.cpp b/mozilla/xpcom/ds/nsQuickSort.cpp index e799dc79523..9ec22e6247e 100644 --- a/mozilla/xpcom/ds/nsQuickSort.cpp +++ b/mozilla/xpcom/ds/nsQuickSort.cpp @@ -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);*/ } diff --git a/mozilla/xpcom/ds/nsQuickSort.h b/mozilla/xpcom/ds/nsQuickSort.h index b90cb4634f8..93ac78cd0a9 100644 --- a/mozilla/xpcom/ds/nsQuickSort.h +++ b/mozilla/xpcom/ds/nsQuickSort.h @@ -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 diff --git a/mozilla/xpcom/glue/nsQuickSort.cpp b/mozilla/xpcom/glue/nsQuickSort.cpp index e799dc79523..9ec22e6247e 100644 --- a/mozilla/xpcom/glue/nsQuickSort.cpp +++ b/mozilla/xpcom/glue/nsQuickSort.cpp @@ -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);*/ } diff --git a/mozilla/xpcom/glue/nsQuickSort.h b/mozilla/xpcom/glue/nsQuickSort.h index b90cb4634f8..93ac78cd0a9 100644 --- a/mozilla/xpcom/glue/nsQuickSort.h +++ b/mozilla/xpcom/glue/nsQuickSort.h @@ -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