Loading...
--- Libc/Libc-825.26/stdlib/FreeBSD/radixsort.c
+++ Libc/Libc-763.11/stdlib/FreeBSD/radixsort.c
@@ -53,7 +53,6 @@
#include <stdlib.h>
#include <stddef.h>
#include <errno.h>
-#include <pthread.h>
typedef struct {
const u_char **sa;
@@ -61,16 +60,10 @@
} stack;
static inline void simplesort
-(const u_char **, int, int, const u_char *, u_int) __attribute__((always_inline));
+(const u_char **, int, int, const u_char *, u_int);
static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
static void r_sort_b(const u_char **, const u_char **, int, int,
const u_char *, u_int);
-
-static int *r_sort_a_count;
-static int *r_sort_b_count;
-
-static void r_sort_count_allocate(void);
-static pthread_once_t r_sort_count_control = PTHREAD_ONCE_INIT;
#define THRESHOLD 20 /* Divert to simplesort(). */
#define SIZE 512 /* Default stack size. */
@@ -131,12 +124,6 @@
return (0);
}
-static void r_sort_count_allocate(void)
-{
- r_sort_a_count = calloc(256, sizeof(int));
- r_sort_b_count = calloc(256, sizeof(int));
-}
-
#define empty(s) (s >= sp)
#define pop(a, n, i) a = (--sp)->sa, n = sp->sn, i = sp->si
#define push(a, n, i) sp->sa = a, sp->sn = n, (sp++)->si = i
@@ -150,18 +137,12 @@
const u_char *tr;
u_int endch;
{
- static int *count, nc, bmin;
+ static int count[256], nc, bmin;
int c;
const u_char **ak, *r;
stack s[SIZE], *sp, *sp0, *sp1, temp;
int *cp, bigc;
const u_char **an, *t, **aj, **top[256];
-
- if (pthread_once(&r_sort_count_control, r_sort_count_allocate)) {
- return;
- }
-
- count = r_sort_a_count;
/* Set up stack. */
sp = s;
@@ -258,18 +239,12 @@
const u_char *tr;
u_int endch;
{
- static int *count, nc, bmin;
+ static int count[256], nc, bmin;
int c;
const u_char **ak, **ai;
stack s[512], *sp, *sp0, *sp1, temp;
const u_char **top[256];
int *cp, bigc;
-
- if (pthread_once(&r_sort_count_control, r_sort_count_allocate)) {
- return;
- }
-
- count = r_sort_b_count;
sp = s;
push(a, n, i);