reverted changes

Author: badasahog

src/fsort.c

@@ -18,13 +18,13 @@ static void dinsert(double *x, const int n) {   // TODO: if and when twiddled, d
 
 static uint64_t minULL;
 
-static void dradix_r(            // single-threaded recursive worker
-  double * restrict in,          // n doubles to be sorted
-  double * restrict working,     // working memory to put the sorted items before copying over *in; must not overlap *in
-  uint64_t n,                    // number of items to sort.  *in and *working must be at least n long
-  int fromBit,                   // After twiddle to ordered ull, the bits [fromBit,toBit] are used to count
-  int toBit,                     //   fromBit<toBit; bit 0 is the least significant; fromBit is right shift amount too
-  uint64_t * restrict counts     // already zero'd counts vector, 2^(toBit-fromBit+1) long. A stack of these is reused.
+static void dradix_r(  // single-threaded recursive worker
+  double *in,          // n doubles to be sorted
+  double *working,     // working memory to put the sorted items before copying over *in; must not overlap *in
+  uint64_t n,          // number of items to sort.  *in and *working must be at least n long
+  int fromBit,         // After twiddle to ordered ull, the bits [fromBit,toBit] are used to count
+  int toBit,           //   fromBit<toBit; bit 0 is the least significant; fromBit is right shift amount too
+  uint64_t *counts     // already zero'd counts vector, 2^(toBit-fromBit+1) long. A stack of these is reused.
 ) {
   uint64_t width = 1ULL<<(toBit-fromBit+1);
   uint64_t mask = width-1;
@@ -347,4 +347,3 @@ SEXP fsort(SEXP x, SEXP verboseArg) {
   UNPROTECT(nprotect);
   return(ansVec);
 }
-

src/fwriteR.c

@@ -75,15 +75,16 @@ static int32_t whichWriter(SEXP);
 
 void writeList(const void *col, int64_t row, char **pch) {
   SEXP v = ((const SEXP *)col)[row];
-  const int32_t wf = whichWriter(v);
+  int32_t wf = whichWriter(v);
   if (TYPEOF(v)==VECSXP || wf==INT32_MIN || isFactor(v)) {
     internal_error(__func__, "TYPEOF(v)!=VECSXP && wf!=INT32_MIN && !isFactor(v); getMaxListItem should have caught this up front");  // # nocov
   }
   char *ch = *pch;
   write_chars(sep2start, &ch);
   const void *data = DATAPTR_RO(v);
+  writer_fun_t *fun = funs[wf];
   for (int j=0; j<LENGTH(v); j++) {
-    funs[wf](data, j, &ch);
+    (*fun)(data, j, &ch);
     *ch++ = sep2;
   }
   if (LENGTH(v)) ch--; // backup over the last sep2 after the last item
@@ -310,4 +311,4 @@ SEXP fwriteR(
 
   UNPROTECT(protecti);
   return(R_NilValue);
-}
+}