diff options
Diffstat (limited to 'stringsort.c')
| -rw-r--r-- | stringsort.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/stringsort.c b/stringsort.c index 28fa155..5f47528 100644 --- a/stringsort.c +++ b/stringsort.c @@ -35,11 +35,9 @@ static void stradjust(unsigned long *optrarray, static void StrHeapSort(unsigned long *optrarray, unsigned char *strarray, unsigned long numstrings, - unsigned long bottom, unsigned long top); static int str_is_less(unsigned long *optrarray, unsigned char *strarray, - unsigned long numstrings, unsigned long a, unsigned long b); static void strsift(unsigned long *optrarray, @@ -145,7 +143,7 @@ DoStringSortIteration(unsigned char *array, unsigned int num_arrays) start = clock(); for(i = 0; i < num_arrays; i++) { - StrHeapSort(tempobase, tempsbase, nstrings, 0L, nstrings - 1); + StrHeapSort(tempobase, tempsbase, nstrings, nstrings - 1); tempobase += nstrings; /* Advance base pointers */ tempsbase += ARRAY_SIZE + 100; } @@ -375,7 +373,6 @@ return; static void StrHeapSort(unsigned long *optrarray, /* Offset pointers */ unsigned char *strarray, /* Strings array */ unsigned long numstrings, /* # of strings in array */ - unsigned long bottom, /* Region to sort...bottom */ unsigned long top) /* Region to sort...top */ { unsigned char temp[80]; /* Used to exchange elements */ @@ -426,7 +423,6 @@ for(i=top; i>0; --i) */ static int str_is_less(unsigned long *optrarray, /* Offset pointers */ unsigned char *strarray, /* String array */ - unsigned long numstrings, /* # of strings */ unsigned long a, unsigned long b) /* Offsets */ { int slen; /* String length */ @@ -485,9 +481,9 @@ while((i+i)<=j) { k=i+i; if(k<j) - if(str_is_less(optrarray,strarray,numstrings,k,k+1L)) + if(str_is_less(optrarray,strarray,k,k+1L)) ++k; - if(str_is_less(optrarray,strarray,numstrings,i,k)) + if(str_is_less(optrarray,strarray,i,k)) { /* temp=string[k] */ tlen=*(strarray+*(optrarray+k)); |