X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/d1694464b875e336ac335741596b15361929f630..05b75f8d50b83e943af3be4071449304d82dbdcd:/lib/trackname.c

diff --git a/lib/trackname.c b/lib/trackname.c
index 53824d7..14de985 100644
--- a/lib/trackname.c
+++ b/lib/trackname.c
@@ -18,20 +18,17 @@
  * USA
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
 #include <pcre.h>
 #include <fnmatch.h>
-#include <string.h>
-#include <assert.h>
 
 #include "trackname.h"
 #include "configuration.h"
 #include "regsub.h"
 #include "log.h"
 #include "filepart.h"
-#include "words.h"
+#include "unicode.h"
 
 const struct collection *find_track_collection(const char *track) {
   int n;
@@ -109,41 +106,6 @@ const char *trackname_transform(const char *type,
   return subject;
 }
 
-int compare_tracks(const char *sa, const char *sb,
-		   const char *da, const char *db,
-		   const char *ta, const char *tb) {
-  int c;
-
-  if((c = strcmp(casefold(sa), casefold(sb)))) return c;
-  if((c = strcmp(sa, sb))) return c;
-  if((c = strcmp(casefold(da), casefold(db)))) return c;
-  if((c = strcmp(da, db))) return c;
-  return compare_path(ta, tb);
-}
-
-int compare_path_raw(const unsigned char *ap, size_t an,
-		     const unsigned char *bp, size_t bn) {
-  while(an > 0 && bn > 0) {
-    if(*ap == *bp) {
-      ap++;
-      bp++;
-      an--;
-      bn--;
-    } else if(*ap == '/') {
-      return -1;		/* /a/b < /aa/ */
-    } else if(*bp == '/') {
-      return 1;			/* /aa > /a/b */
-    } else
-      return *ap - *bp;
-  }
-  if(an > 0)
-    return 1;			/* /a/b > /a and /ab > /a */
-  else if(bn > 0)
-    return -1;			/* /a < /ab and /a < /a/b */
-  else
-    return 0;
-}
-
 /*
 Local Variables:
 c-basic-offset:2