Rename comparePos() to compareWordEntryPos()

Rename comparePos() to compareWordEntryPos() to prevent export of too
generic name.

Per gripe from Tom Lane.

diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c
index 2a26c46551cbde88adf5f8767a7496ccdf39e260..41bf3fb11e31b1f126a5bd4d936fafb11ddc7d28 100644 (file)
--- a/src/backend/utils/adt/tsvector.c
+++ b/src/backend/utils/adt/tsvector.c
@@ -29,7 +29,7 @@ typedef struct
 
 /* Compare two WordEntryPos values for qsort */
 int
-comparePos(const void *a, const void *b)
+compareWordEntryPos(const void *a, const void *b)
 {
        int                     apos = WEP_GETPOS(*(const WordEntryPos *) a);
        int                     bpos = WEP_GETPOS(*(const WordEntryPos *) b);
@@ -54,7 +54,7 @@ uniquePos(WordEntryPos *a, int l)
        if (l <= 1)
                return l;
 
-       qsort((void *) a, l, sizeof(WordEntryPos), comparePos);
+       qsort((void *) a, l, sizeof(WordEntryPos), compareWordEntryPos);
 
        res = a;
        ptr = a + 1;

diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index e363f2a02332d22051beb708d1914ce06bb30c68..d4fb0ff036d2cc4572417609f6ada1335da8a27f 100644 (file)
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -1216,7 +1216,7 @@ uniqueLongPos(WordEntryPos *pos, int npos)
        if (npos <= 1)
                return npos;
 
-       qsort((void *) pos, npos, sizeof(WordEntryPos), comparePos);
+       qsort((void *) pos, npos, sizeof(WordEntryPos), compareWordEntryPos);
 
        result = pos;
        pos_iter = pos + 1;

diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h
index 5f4e5961939f2ef4fab7380ad5f6a0b0647e4180..ff3fef1f472c8006923b983e5c7aff8cd797909d 100644 (file)
--- a/src/include/tsearch/ts_type.h
+++ b/src/include/tsearch/ts_type.h
@@ -49,7 +49,7 @@ typedef struct
 #define MAXSTRLEN ( (1<<11) - 1)
 #define MAXSTRPOS ( (1<<20) - 1)
 
-extern int comparePos(const void *a, const void *b);
+extern int compareWordEntryPos(const void *a, const void *b);
 
 /*
  * Equivalent to