react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/HDiffPatch/libHDiffPatch/HDiff/private_diff/libdivsufsort/sssort.c.inc.h

@@ -29,13 +29,48 @@
 
 /*- Private Functions -*/
 
+static const saint_t lg_table[256]= {
+ -1,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+  5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
+};
+
 #if (SS_BLOCKSIZE == 0) || (SS_INSERTIONSORT_THRESHOLD < SS_BLOCKSIZE)
 
 static INLINE
 saint_t
 ss_ilg(saidx_t n) {
 #if SS_BLOCKSIZE == 0
-  return tr_ilg(n);
+# if defined(BUILD_DIVSUFSORT64)
+  return (n >> 32) ?
+          ((n >> 48) ?
+            ((n >> 56) ?
+              56 + lg_table[(n >> 56) & 0xff] :
+              48 + lg_table[(n >> 48) & 0xff]) :
+            ((n >> 40) ?
+              40 + lg_table[(n >> 40) & 0xff] :
+              32 + lg_table[(n >> 32) & 0xff])) :
+          ((n & 0xffff0000) ?
+            ((n & 0xff000000) ?
+              24 + lg_table[(n >> 24) & 0xff] :
+              16 + lg_table[(n >> 16) & 0xff]) :
+            ((n & 0x0000ff00) ?
+               8 + lg_table[(n >>  8) & 0xff] :
+               0 + lg_table[(n >>  0) & 0xff]));
+# else
+  return (n & 0xffff0000) ?
+          ((n & 0xff000000) ?
+            24 + lg_table[(n >> 24) & 0xff] :
+            16 + lg_table[(n >> 16) & 0xff]) :
+          ((n & 0x0000ff00) ?
+             8 + lg_table[(n >>  8) & 0xff] :
+             0 + lg_table[(n >>  0) & 0xff]);
+# endif
 #elif SS_BLOCKSIZE < 256
   return lg_table[n];
 #else
@@ -104,7 +139,7 @@ ss_isqrt(saidx_t x) {
 static INLINE
 saint_t
 ss_compare(const sauchar_t *T,
-           const sastore_t*p1, const sastore_t*p2,
+           const saidx_t *p1, const saidx_t *p2,
            saidx_t depth) {
   const sauchar_t *U1, *U2, *U1n, *U2n;
 
@@ -129,9 +164,9 @@ ss_compare(const sauchar_t *T,
 /* Insertionsort for small size groups */
 static
 void
-ss_insertionsort(const sauchar_t *T, const sastore_t *PA,
-                 sastore_t *first, sastore_t *last, saidx_t depth) {
-  sastore_t *i, *j;
+ss_insertionsort(const sauchar_t *T, const saidx_t *PA,
+                 saidx_t *first, saidx_t *last, saidx_t depth) {
+  saidx_t *i, *j;
   saidx_t t;
   saint_t r;
 
@@ -154,8 +189,8 @@ ss_insertionsort(const sauchar_t *T, const sastore_t *PA,
 
 static INLINE
 void
-ss_fixdown(const sauchar_t *Td, const sastore_t *PA,
-           sastore_t* SA, saidx_t i, saidx_t size) {
+ss_fixdown(const sauchar_t *Td, const saidx_t *PA,
+           saidx_t *SA, saidx_t i, saidx_t size) {
   saidx_t j, k;
   saidx_t v;
   saint_t c, d, e;
@@ -171,7 +206,7 @@ ss_fixdown(const sauchar_t *Td, const sastore_t *PA,
 /* Simple top-down heapsort. */
 static
 void
-ss_heapsort(const sauchar_t *Td, const sastore_t*PA, sastore_t* SA, saidx_t size) {
+ss_heapsort(const sauchar_t *Td, const saidx_t *PA, saidx_t *SA, saidx_t size) {
   saidx_t i, m;
   saidx_t t;
 
@@ -195,10 +230,10 @@ ss_heapsort(const sauchar_t *Td, const sastore_t*PA, sastore_t* SA, saidx_t size
 
 /* Returns the median of three elements. */
 static INLINE
-sastore_t*
-ss_median3(const sauchar_t *Td, const sastore_t*PA,
-           sastore_t*v1, sastore_t*v2, sastore_t*v3) {
-  sastore_t*t;
+saidx_t *
+ss_median3(const sauchar_t *Td, const saidx_t *PA,
+           saidx_t *v1, saidx_t *v2, saidx_t *v3) {
+  saidx_t *t;
   if(Td[PA[*v1]] > Td[PA[*v2]]) { SWAP(v1, v2); }
   if(Td[PA[*v2]] > Td[PA[*v3]]) {
     if(Td[PA[*v1]] > Td[PA[*v3]]) { return v1; }
@@ -209,10 +244,10 @@ ss_median3(const sauchar_t *Td, const sastore_t*PA,
 
 /* Returns the median of five elements. */
 static INLINE
-sastore_t*
-ss_median5(const sauchar_t *Td, const sastore_t*PA,
-           sastore_t*v1, sastore_t*v2, sastore_t*v3, sastore_t*v4, sastore_t*v5) {
-  sastore_t *t;
+saidx_t *
+ss_median5(const sauchar_t *Td, const saidx_t *PA,
+           saidx_t *v1, saidx_t *v2, saidx_t *v3, saidx_t *v4, saidx_t *v5) {
+  saidx_t *t;
   if(Td[PA[*v2]] > Td[PA[*v3]]) { SWAP(v2, v3); }
   if(Td[PA[*v4]] > Td[PA[*v5]]) { SWAP(v4, v5); }
   if(Td[PA[*v2]] > Td[PA[*v4]]) { SWAP(v2, v4); SWAP(v3, v5); }
@@ -224,9 +259,9 @@ ss_median5(const sauchar_t *Td, const sastore_t*PA,
 
 /* Returns the pivot element. */
 static INLINE
-sastore_t*
-ss_pivot(const sauchar_t *Td, const sastore_t*PA, sastore_t*first, sastore_t*last) {
-  sastore_t*middle;
+saidx_t *
+ss_pivot(const sauchar_t *Td, const saidx_t *PA, saidx_t *first, saidx_t *last) {
+  saidx_t *middle;
   saidx_t t;
 
   t = (saidx_t)(last - first);
@@ -252,10 +287,10 @@ ss_pivot(const sauchar_t *Td, const sastore_t*PA, sastore_t*first, sastore_t*las
 
 /* Binary partition for substrings. */
 static INLINE
-sastore_t*
-ss_partition(const sastore_t*PA,
-             sastore_t*first, sastore_t*last, saidx_t depth) {
-  sastore_t *a, *b;
+saidx_t *
+ss_partition(const saidx_t *PA,
+                    saidx_t *first, saidx_t *last, saidx_t depth) {
+  saidx_t *a, *b;
   saidx_t t;
   for(a = first - 1, b = last;;) {
     for(; (++a < b) && ((PA[*a] + depth) >= (PA[*a + 1] + 1));) { *a = ~*a; }
@@ -272,13 +307,13 @@ ss_partition(const sastore_t*PA,
 /* Multikey introsort for medium size groups. */
 static
 void
-ss_mintrosort(const sauchar_t *T, const sastore_t *PA,
-              sastore_t *first, sastore_t *last,
+ss_mintrosort(const sauchar_t *T, const saidx_t *PA,
+              saidx_t *first, saidx_t *last,
               saidx_t depth) {
 #define STACK_SIZE SS_MISORT_STACKSIZE
-  struct { sastore_t*a, *b, c; saint_t d; } stack[STACK_SIZE];
+  struct { saidx_t *a, *b, c; saint_t d; } stack[STACK_SIZE];
   const sauchar_t *Td;
-  sastore_t*a, *b, *c, *d, *e, *f;
+  saidx_t *a, *b, *c, *d, *e, *f;
   saidx_t s, t;
   saint_t ssize;
   saint_t limit;
@@ -414,7 +449,7 @@ ss_mintrosort(const sauchar_t *T, const sastore_t *PA,
 
 static INLINE
 void
-ss_blockswap(sastore_t*a, sastore_t*b, saidx_t n) {
+ss_blockswap(saidx_t *a, saidx_t *b, saidx_t n) {
   saidx_t t;
   for(; 0 < n; --n, ++a, ++b) {
     t = *a, *a = *b, *b = t;
@@ -423,8 +458,8 @@ ss_blockswap(sastore_t*a, sastore_t*b, saidx_t n) {
 
 static INLINE
 void
-ss_rotate(sastore_t*first, sastore_t*middle, sastore_t*last) {
-  sastore_t*a, *b, t;
+ss_rotate(saidx_t *first, saidx_t *middle, saidx_t *last) {
+  saidx_t *a, *b, t;
   saidx_t l, r;
   l = (saidx_t)(middle - first), r = (saidx_t)(last - middle);
   for(; (0 < l) && (0 < r);) {
@@ -464,11 +499,11 @@ ss_rotate(sastore_t*first, sastore_t*middle, sastore_t*last) {
 
 static
 void
-ss_inplacemerge(const sauchar_t *T, const sastore_t*PA,
-                sastore_t*first, sastore_t*middle, sastore_t*last,
+ss_inplacemerge(const sauchar_t *T, const saidx_t *PA,
+                saidx_t *first, saidx_t *middle, saidx_t *last,
                 saidx_t depth) {
-  const sastore_t*p;
-  sastore_t*a, *b;
+  const saidx_t *p;
+  saidx_t *a, *b;
   saidx_t len, half;
   saint_t q, r;
   saint_t x;
@@ -507,10 +542,10 @@ ss_inplacemerge(const sauchar_t *T, const sastore_t*PA,
 /* Merge-forward with internal buffer. */
 static
 void
-ss_mergeforward(const sauchar_t *T, const sastore_t*PA,
-                sastore_t*first, sastore_t*middle, sastore_t*last,
-                sastore_t*buf, saidx_t depth) {
-  sastore_t*a, *b, *c, *bufend;
+ss_mergeforward(const sauchar_t *T, const saidx_t *PA,
+                saidx_t *first, saidx_t *middle, saidx_t *last,
+                saidx_t *buf, saidx_t depth) {
+  saidx_t *a, *b, *c, *bufend;
   saidx_t t;
   saint_t r;
 
@@ -557,11 +592,11 @@ ss_mergeforward(const sauchar_t *T, const sastore_t*PA,
 /* Merge-backward with internal buffer. */
 static
 void
-ss_mergebackward(const sauchar_t *T, const sastore_t*PA,
-                 sastore_t*first, sastore_t*middle, sastore_t*last,
-                 sastore_t*buf, saidx_t depth) {
-  const sastore_t*p1, *p2;
-  sastore_t*a, *b, *c, *bufend;
+ss_mergebackward(const sauchar_t *T, const saidx_t *PA,
+                 saidx_t *first, saidx_t *middle, saidx_t *last,
+                 saidx_t *buf, saidx_t depth) {
+  const saidx_t *p1, *p2;
+  saidx_t *a, *b, *c, *bufend;
   saidx_t t;
   saint_t r;
   saint_t x;
@@ -616,9 +651,9 @@ ss_mergebackward(const sauchar_t *T, const sastore_t*PA,
 /* D&C based merge. */
 static
 void
-ss_swapmerge(const sauchar_t *T, const sastore_t*PA,
-             sastore_t*first, sastore_t*middle, sastore_t*last,
-             sastore_t*buf, saidx_t bufsize, saidx_t depth) {
+ss_swapmerge(const sauchar_t *T, const saidx_t *PA,
+             saidx_t *first, saidx_t *middle, saidx_t *last,
+             saidx_t *buf, saidx_t bufsize, saidx_t depth) {
 #define STACK_SIZE SS_SMERGE_STACKSIZE
 #define GETIDX(a) ((0 <= (a)) ? (a) : (~(a)))
 #define MERGE_CHECK(a, b, c)\
@@ -631,8 +666,8 @@ ss_swapmerge(const sauchar_t *T, const sastore_t*PA,
       *(b) = ~*(b);\
     }\
   } while(0)
-  struct { sastore_t*a, *b, *c; saint_t d; } stack[STACK_SIZE];
-  sastore_t*l, *r, *lm, *rm;
+  struct { saidx_t *a, *b, *c; saint_t d; } stack[STACK_SIZE];
+  saidx_t *l, *r, *lm, *rm;
   saidx_t m, len, half;
   saint_t ssize;
   saint_t check, next;
@@ -709,13 +744,13 @@ ss_swapmerge(const sauchar_t *T, const sastore_t*PA,
 
 /* Substring sort */
 void
-sssort(const sauchar_t *T, const sastore_t*PA,
-       sastore_t *first, sastore_t*last,
-       sastore_t *buf, saidx_t bufsize,
+sssort(const sauchar_t *T, const saidx_t *PA,
+       saidx_t *first, saidx_t *last,
+       saidx_t *buf, saidx_t bufsize,
        saidx_t depth, saidx_t n, saint_t lastsuffix) {
-  sastore_t *a;
+  saidx_t *a;
 #if SS_BLOCKSIZE != 0
-  sastore_t *b, *middle, *curbuf;
+  saidx_t *b, *middle, *curbuf;
   saidx_t j, k, curbufsize, limit;
 #endif
   saidx_t i;
@@ -769,7 +804,7 @@ sssort(const sauchar_t *T, const sastore_t*PA,
 
   if(lastsuffix != 0) {
     /* Insert last type B* suffix. */
-    sastore_t PAi[2]; PAi[0] = PA[*(first - 1)], PAi[1] = n - 2;
+    saidx_t PAi[2]; PAi[0] = PA[*(first - 1)], PAi[1] = n - 2;
     for(a = first, i = *(first - 1);
         (a < last) && ((*a < 0) || (0 < ss_compare(T, &(PAi[0]), PA + *a, depth)));
         ++a) {

package/harmony/pushy/src/main/cpp/HDiffPatch/libHDiffPatch/HDiff/private_diff/libdivsufsort/trsort.c.inc.h

@@ -29,18 +29,21 @@
 
 /*- Private Functions -*/
 
+static const saint_t lg_table[256]= {
+ -1,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+  5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+  6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
+};
+
 static INLINE
 saint_t
 tr_ilg(saidx_t n) {
-#if !defined(BUILD_DIVSUFSORT64)
-  return (n & 0xffff0000) ?
-          ((n & 0xff000000) ?
-            24 + lg_table[(n >> 24) & 0xff] :
-            16 + lg_table[(n >> 16) & 0xff]) :
-          ((n & 0x0000ff00) ?
-             8 + lg_table[(n >>  8) & 0xff] :
-             0 + lg_table[(n >>  0) & 0xff]);
-#else
+#if defined(BUILD_DIVSUFSORT64)
   return (n >> 32) ?
           ((n >> 48) ?
             ((n >> 56) ?
@@ -56,6 +59,14 @@ tr_ilg(saidx_t n) {
             ((n & 0x0000ff00) ?
                8 + lg_table[(n >>  8) & 0xff] :
                0 + lg_table[(n >>  0) & 0xff]));
+#else
+  return (n & 0xffff0000) ?
+          ((n & 0xff000000) ?
+            24 + lg_table[(n >> 24) & 0xff] :
+            16 + lg_table[(n >> 16) & 0xff]) :
+          ((n & 0x0000ff00) ?
+             8 + lg_table[(n >>  8) & 0xff] :
+             0 + lg_table[(n >>  0) & 0xff]);
 #endif
 }
 
@@ -65,8 +76,8 @@ tr_ilg(saidx_t n) {
 /* Simple insertionsort for small size groups. */
 static
 void
-tr_insertionsort(const sastore_t*ISAd, sastore_t*first, sastore_t*last) {
-  sastore_t*a, *b;
+tr_insertionsort(const saidx_t *ISAd, saidx_t *first, saidx_t *last) {
+  saidx_t *a, *b;
   saidx_t t, r;
 
   for(a = first + 1; a < last; ++a) {
@@ -84,7 +95,7 @@ tr_insertionsort(const sastore_t*ISAd, sastore_t*first, sastore_t*last) {
 
 static INLINE
 void
-tr_fixdown(const sastore_t*ISAd, sastore_t* SA, saidx_t i, saidx_t size) {
+tr_fixdown(const saidx_t *ISAd, saidx_t *SA, saidx_t i, saidx_t size) {
   saidx_t j, k;
   saidx_t v;
   saidx_t c, d, e;
@@ -100,7 +111,7 @@ tr_fixdown(const sastore_t*ISAd, sastore_t* SA, saidx_t i, saidx_t size) {
 /* Simple top-down heapsort. */
 static
 void
-tr_heapsort(const sastore_t*ISAd, sastore_t* SA, saidx_t size) {
+tr_heapsort(const saidx_t *ISAd, saidx_t *SA, saidx_t size) {
   saidx_t i, m;
   saidx_t t;
 
@@ -124,9 +135,9 @@ tr_heapsort(const sastore_t*ISAd, sastore_t* SA, saidx_t size) {
 
 /* Returns the median of three elements. */
 static INLINE
-sastore_t*
-tr_median3(const sastore_t*ISAd, sastore_t*v1, sastore_t*v2, sastore_t*v3) {
-  sastore_t*t;
+saidx_t *
+tr_median3(const saidx_t *ISAd, saidx_t *v1, saidx_t *v2, saidx_t *v3) {
+  saidx_t *t;
   if(ISAd[*v1] > ISAd[*v2]) { SWAP(v1, v2); }
   if(ISAd[*v2] > ISAd[*v3]) {
     if(ISAd[*v1] > ISAd[*v3]) { return v1; }
@@ -137,10 +148,10 @@ tr_median3(const sastore_t*ISAd, sastore_t*v1, sastore_t*v2, sastore_t*v3) {
 
 /* Returns the median of five elements. */
 static INLINE
-sastore_t*
-tr_median5(const sastore_t*ISAd,
-           sastore_t*v1, sastore_t*v2, sastore_t*v3, sastore_t*v4, sastore_t*v5) {
-  sastore_t*t;
+saidx_t *
+tr_median5(const saidx_t *ISAd,
+           saidx_t *v1, saidx_t *v2, saidx_t *v3, saidx_t *v4, saidx_t *v5) {
+  saidx_t *t;
   if(ISAd[*v2] > ISAd[*v3]) { SWAP(v2, v3); }
   if(ISAd[*v4] > ISAd[*v5]) { SWAP(v4, v5); }
   if(ISAd[*v2] > ISAd[*v4]) { SWAP(v2, v4); SWAP(v3, v5); }
@@ -152,9 +163,9 @@ tr_median5(const sastore_t*ISAd,
 
 /* Returns the pivot element. */
 static INLINE
-sastore_t*
-tr_pivot(const sastore_t*ISAd, sastore_t*first, sastore_t*last) {
-  sastore_t*middle;
+saidx_t *
+tr_pivot(const saidx_t *ISAd, saidx_t *first, saidx_t *last) {
+  saidx_t *middle;
   saidx_t t;
 
   t = (saidx_t)(last - first);
@@ -177,18 +188,14 @@ tr_pivot(const sastore_t*ISAd, sastore_t*first, sastore_t*last) {
 
 
 /*---------------------------------------------------------------------------*/
-#if defined (__cplusplus)
-namespace{
-#endif
-typedef struct _trbudget_t {
+
+typedef struct _trbudget_t trbudget_t;
+struct _trbudget_t {
   saidx_t chance;
   saidx_t remain;
   saidx_t incval;
   saidx_t count;
-} trbudget_t;
-#if defined (__cplusplus)
-}//namespace
-#endif
+};
 
 static INLINE
 void
@@ -212,10 +219,10 @@ trbudget_check(trbudget_t *budget, saidx_t size) {
 
 static INLINE
 void
-tr_partition(const sastore_t*ISAd,
-             sastore_t*first, sastore_t*middle, sastore_t*last,
-             sastore_t**pa, sastore_t**pb, saidx_t v) {
-  sastore_t*a, *b, *c, *d, *e, *f;
+tr_partition(const saidx_t *ISAd,
+             saidx_t *first, saidx_t *middle, saidx_t *last,
+             saidx_t **pa, saidx_t **pb, saidx_t v) {
+  saidx_t *a, *b, *c, *d, *e, *f;
   saidx_t t, s;
   saidx_t x = 0;
 
@@ -254,12 +261,12 @@ tr_partition(const sastore_t*ISAd,
 
 static
 void
-tr_copy(sastore_t*ISA, const sastore_t* SA,
-        sastore_t*first, sastore_t*a, sastore_t*b, sastore_t*last,
+tr_copy(saidx_t *ISA, const saidx_t *SA,
+        saidx_t *first, saidx_t *a, saidx_t *b, saidx_t *last,
         saidx_t depth) {
   /* sort suffixes of middle partition
      by using sorted order of suffixes of left and right partition. */
-  sastore_t*c, *d, *e;
+  saidx_t *c, *d, *e;
   saidx_t s, v;
 
   v = (saidx_t)(b - SA - 1);
@@ -279,10 +286,10 @@ tr_copy(sastore_t*ISA, const sastore_t* SA,
 
 static
 void
-tr_partialcopy(sastore_t*ISA, const sastore_t* SA,
-               sastore_t*first, sastore_t*a, sastore_t*b, sastore_t*last,
+tr_partialcopy(saidx_t *ISA, const saidx_t *SA,
+               saidx_t *first, saidx_t *a, saidx_t *b, saidx_t *last,
                saidx_t depth) {
-  sastore_t *c, *d, *e;
+  saidx_t *c, *d, *e;
   saidx_t s, v;
   saidx_t rank, lastrank, newrank = -1;
 
@@ -317,12 +324,12 @@ tr_partialcopy(sastore_t*ISA, const sastore_t* SA,
 
 static
 void
-tr_introsort(sastore_t*ISA, const sastore_t*ISAd,
-             sastore_t* SA, sastore_t*first, sastore_t*last,
+tr_introsort(saidx_t *ISA, const saidx_t *ISAd,
+             saidx_t *SA, saidx_t *first, saidx_t *last,
              trbudget_t *budget) {
 #define STACK_SIZE TR_STACKSIZE
-  struct { const sastore_t*a; sastore_t*b, *c; saint_t d, e; }stack[STACK_SIZE];
-  sastore_t*a, *b, *c;
+  struct { const saidx_t *a; saidx_t *b, *c; saint_t d, e; }stack[STACK_SIZE];
+  saidx_t *a, *b, *c;
   saidx_t t;
   saidx_t v, x = 0;
   saidx_t incr = (saidx_t)(ISAd - ISA);
@@ -545,9 +552,9 @@ tr_introsort(sastore_t*ISA, const sastore_t*ISAd,
 
 /* Tandem repeat sort */
 void
-trsort(sastore_t *ISA, sastore_t* SA, saidx_t n, saidx_t depth) {
-  sastore_t*ISAd;
-  sastore_t*first, *last;
+trsort(saidx_t *ISA, saidx_t *SA, saidx_t n, saidx_t depth) {
+  saidx_t *ISAd;
+  saidx_t *first, *last;
   trbudget_t budget;
   saidx_t t, skip, unsorted;